diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-06 09:49:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-06 09:49:28 +0100 |
| commit | 75ec4eb3dc84ee78533bd59bbb71992187bd86fd (patch) | |
| tree | b75afe1763e5a21bfe508301562c037fbae2b04d /arch/x86/Kconfig | |
| parent | 19c5787a5ff88a959e5854ab6ddef7f5777c5837 (diff) | |
| parent | 15670bfe19905b1dcbb63137f40d718b59d84479 (diff) | |
Merge branch 'x86/mm' into x86/asm, to pick up pending changes
Concentrate x86 MM and asm related changes into a single super-topic,
in preparation for larger changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 6b94ca0aa585..9ab7629feac7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -302,7 +302,6 @@ config ARCH_SUPPORTS_DEBUG_PAGEALLOC config KASAN_SHADOW_OFFSET hex depends on KASAN - default 0xdff8000000000000 if X86_5LEVEL default 0xdffffc0000000000 config HAVE_INTEL_TXT |