summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorH. Peter Anvin2014-05-04 19:00:49 +0200
committerH. Peter Anvin2014-05-04 19:00:49 +0200
commit197725de65477bc8509b41388157c1a2283542bb (patch)
tree3c6a93426fe489b6c8f6e87027c73cf970bacdc5 /arch/x86/Kconfig
parentx86, espfix: Fix broken header guard (diff)
downloadkernel-qcow2-linux-197725de65477bc8509b41388157c1a2283542bb.tar.gz
kernel-qcow2-linux-197725de65477bc8509b41388157c1a2283542bb.tar.xz
kernel-qcow2-linux-197725de65477bc8509b41388157c1a2283542bb.zip
x86, espfix: Make espfix64 a Kconfig option, fix UML
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
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 25d2c6f7325e..9a952a572585 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -914,6 +914,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