diff options
| author | Yinghai Lu | 2008-06-26 02:55:20 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-08 13:10:50 +0200 |
| commit | 217b8ce89088dd47e7176686ff34573f75a624e9 (patch) | |
| tree | eeee490e9d86b95d08fbf1396afc1e0f64f212b6 /arch/x86/kernel/setup.c | |
| parent | x86: rename setup_32.c to setup.c (diff) | |
| download | kernel-qcow2-linux-217b8ce89088dd47e7176686ff34573f75a624e9.tar.gz kernel-qcow2-linux-217b8ce89088dd47e7176686ff34573f75a624e9.tar.xz kernel-qcow2-linux-217b8ce89088dd47e7176686ff34573f75a624e9.zip | |
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/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 6 |
1 files changed, 6 insertions, 0 deletions
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 <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! */ |