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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
(cherry picked from 3.2 commit da22646d97b7322c757f3a7a21805a3475fed231)
Signed-off-by: Willy Tarreau <w@1wt.eu>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ee0168d83093ef1d24632172d7bf050b5508e141..026fe602684a54a3e00e5ea0853c11e1b6216ba8 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -887,6 +887,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

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index f58fd89208c66e8dd63256135e1ea3f174799649..945ad6f2340b31530abba00318af1e8593b7e50f 100644 (file)
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -40,7 +40,7 @@ obj-$(CONFIG_X86_32)  += probe_roms_32.o
 obj-$(CONFIG_X86_32)   += sys_i386_32.o i386_ksyms_32.o
 obj-$(CONFIG_X86_64)   += sys_x86_64.o x8664_ksyms_64.o
 obj-$(CONFIG_X86_64)   += syscall_64.o vsyscall_64.o
-obj-$(CONFIG_X86_64)   += espfix_64.o
+obj-$(CONFIG_X86_ESPFIX64)     += espfix_64.o
 obj-y                  += bootflag.o e820.o
 obj-y                  += pci-dma.o quirks.o i8237.o topology.o kdebugfs.o
 obj-y                  += alternative.o i8253.o pci-nommu.o

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 0854448ed6a19ea6a33e04e653af1bce28df3f48..ca6b3f952a318294f41fb5fc90913d001f5bcf6f 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -328,7 +328,7 @@ notrace static void __cpuinit start_secondary(void *unused)
        /*
         * Enable the espfix hack for this CPU
         */
-#ifdef CONFIG_X86_64
+#ifdef CONFIG_X86_ESPFIX64
        init_espfix_ap();
 #endif
 

diff --git a/init/main.c b/init/main.c
index 0dfcc1ab8719ecf02cda02150f96bb42f2177ca5..00e62865cc6daa891e521975c7b77243384832cd 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -659,7 +659,7 @@ asmlinkage void __init start_kernel(void)
        if (efi_enabled)
                efi_enter_virtual_mode();
 #endif
-#ifdef CONFIG_X86_64
+#ifdef CONFIG_X86_ESPFIX64
        /* Should be run before the first non-init thread is created */
        init_espfix_bsp();
 #endif