diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-25 17:55:20 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 13:10:50 +0200 |
| commit | 217b8ce89088dd47e7176686ff34573f75a624e9 (patch) | |
| tree | eeee490e9d86b95d08fbf1396afc1e0f64f212b6 /arch/x86/kernel | |
| parent | 55f262391a2365d657a00ed68edd1a51bca66af5 (diff) | |
x86: move boot_params back to setup.c
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/setup.c | 6 | ||||
| -rw-r--r-- | arch/x86/kernel/setup_percpu.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 222d7038f2f..f24a8fe8a7e 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -118,6 +118,12 @@ #include <asm/highmem.h> #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 5c0c4bb5727..5497fb9b00a 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c @@ -15,12 +15,6 @@ #include <asm/apicdef.h> #include <asm/highmem.h> -#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; |