forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
225c37d71b
commit
7f0be02c5e
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user