From: Yinghai Lu Date: Thu, 26 Jun 2008 00:55:20 +0000 (-0700) Subject: x86: move boot_params back to setup.c X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=217b8ce89088dd47e7176686ff34573f75a624e9;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git x86: move boot_params back to setup.c Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 222d7038f2fd..f24a8fe8a7e4 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -118,6 +118,12 @@ #include #endif +#ifndef CONFIG_DEBUG_BOOT_PARAMS +struct boot_params __initdata boot_params; +#else +struct boot_params boot_params; +#endif + /* This value is set up by the early boot code to point to the value immediately after the boot time page tables. It contains a *physical* address, and must not be in the .bss segment! */ diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index 5c0c4bb5727d..5497fb9b00a0 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c @@ -15,12 +15,6 @@ #include #include -#ifndef CONFIG_DEBUG_BOOT_PARAMS -struct boot_params __initdata boot_params; -#else -struct boot_params boot_params; -#endif - #ifdef CONFIG_X86_LOCAL_APIC unsigned int num_processors; unsigned disabled_cpus __cpuinitdata;