diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-22 17:37:54 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:50:17 +0200 |
| commit | 7f0be02c5ed1deb04c54c6a17f412e04f417df11 (patch) | |
| tree | 5512d0801da2ef24c44d03ebf967ca8a2f821e1f | |
| parent | 225c37d71bc8b97eb2063e8eda153b383328b20b (diff) | |
x86: move boot_params declaring to setup.c
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/cpu/common_64.c | 6 | ||||
| -rw-r--r-- | arch/x86/kernel/setup.c | 6 | ||||
| -rw-r--r-- | arch/x86/kernel/setup_32.c | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/arch/x86/kernel/cpu/common_64.c b/arch/x86/kernel/cpu/common_64.c index 9fb5b7caaa89..39eaefbcec06 100644 --- a/arch/x86/kernel/cpu/common_64.c +++ b/arch/x86/kernel/cpu/common_64.c @@ -421,12 +421,6 @@ static __init int setup_disablecpuid(char *arg) } __setup("clearcpuid=", setup_disablecpuid); -#ifndef CONFIG_DEBUG_BOOT_PARAMS -struct boot_params __initdata boot_params; -#else -struct boot_params boot_params; -#endif - cpumask_t cpu_initialized __cpuinitdata = CPU_MASK_NONE; struct x8664_pda **_cpu_pda __read_mostly; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 5497fb9b00a0..5c0c4bb5727d 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -15,6 +15,12 @@ #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; diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 90b51047ce63..3149f434d7d0 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c @@ -163,12 +163,6 @@ unsigned long saved_video_mode; static char __initdata command_line[COMMAND_LINE_SIZE]; -#ifndef CONFIG_DEBUG_BOOT_PARAMS -struct boot_params __initdata boot_params; -#else -struct boot_params boot_params; -#endif - #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) struct edd edd; #ifdef CONFIG_EDD_MODULE |