diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-04-13 23:57:27 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-04-13 23:57:27 +0200 |
| commit | 09675bd395458543e70d19544f8046038a2fd053 (patch) | |
| tree | 03561bcf7875f5b093d2f01b1158efa597d42199 /arch/s390/Kconfig | |
| parent | bcf5d545890e9f7414341c572337ce58cba00a32 (diff) | |
| parent | 21042d43b34129cef00d185b7aa2705d1249f879 (diff) | |
Merge branch 'for-4.1/core-s390' into for-linus
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 68b68d755fdf..eba9c1d0dab5 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -133,6 +133,7 @@ config S390 select HAVE_KPROBES select HAVE_KRETPROBES select HAVE_KVM if 64BIT + select HAVE_LIVEPATCH select HAVE_MEMBLOCK select HAVE_MEMBLOCK_NODE_MAP select HAVE_MEMBLOCK_PHYS_MAP @@ -160,6 +161,8 @@ source "init/Kconfig" source "kernel/Kconfig.freezer" +source "kernel/livepatch/Kconfig" + menu "Processor type and features" config HAVE_MARCH_Z900_FEATURES |