diff options
author | H. Peter Anvin <hpa@zytor.com> | 2014-05-04 19:00:49 +0200 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2014-05-04 19:00:49 +0200 |
commit | 197725de65477bc8509b41388157c1a2283542bb (patch) | |
tree | 3c6a93426fe489b6c8f6e87027c73cf970bacdc5 /init | |
parent | x86, espfix: Fix broken header guard (diff) | |
download | linux-197725de65477bc8509b41388157c1a2283542bb.tar.xz 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 'init')
-rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 70fc00e7db06..58c132d7de4b 100644 --- a/init/main.c +++ b/init/main.c @@ -617,7 +617,7 @@ asmlinkage void __init start_kernel(void) if (efi_enabled(EFI_RUNTIME_SERVICES)) 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 |