diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-06 15:51:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-06 15:51:56 +0200 |
| commit | 02678a582392111928650f116b34091bfdb6441e (patch) | |
| tree | b4a8d6ad38f7c405a362f597ff04871bfe20a81b /arch/x86/Kconfig | |
| parent | bce6824cc8e86619901265b7e77c59cc9d99e05b (diff) | |
| parent | 77ac1c02d9f20a0d72fa992c88b98c15d087dbca (diff) | |
Merge branch 'core/core' into x86/build, to prevent conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 1a0be022f91d..603f374f871d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -119,6 +119,7 @@ config X86 select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_HUGE_VMAP if X86_64 || X86_PAE select HAVE_ARCH_JUMP_LABEL + select HAVE_ARCH_JUMP_LABEL_RELATIVE select HAVE_ARCH_KASAN if X86_64 select HAVE_ARCH_KGDB select HAVE_ARCH_MMAP_RND_BITS if MMU |