summaryrefslogtreecommitdiff
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2014-05-04 10:00:49 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-08-07 14:52:38 -0700
commit09aaa9748aa1aea0b2fa339a823b754285c8ad6c (patch)
tree1b6da0d0f627924267315b97c7680f811a8ffa4b /arch/x86/Kconfig
parent1ce1f063cc68d326ed6c303d4c1a8bcca6fce35f (diff)
x86, espfix: Make espfix64 a Kconfig option, fix UML
commit 197725de65477bc8509b41388157c1a2283542bb upstream. Make espfix64 a hidden Kconfig option. This fixes the x86-64 UML build which had broken due to the non-existence of init_espfix_bsp() in UML: since UML uses its own Kconfig, this option does not appear in the UML build. This also makes it possible to make support for 16-bit segments a configuration option, for the people who want to minimize the size of the kernel. Reported-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Richard Weinberger <richard@nod.at> Link: http://lkml.kernel.org/r/1398816946-3351-1-git-send-email-hpa@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 7324107acb40..fb1f75b73bf6 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -971,6 +971,10 @@ config VM86
XFree86 to initialize some video cards via BIOS. Disabling this
option saves about 6k.
+config X86_ESPFIX64
+ def_bool y
+ depends on X86_64
+
config TOSHIBA
tristate "Toshiba Laptop support"
depends on X86_32