diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-25 20:55:20 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 07:10:50 -0400 |
commit | 217b8ce89088dd47e7176686ff34573f75a624e9 (patch) | |
tree | eeee490e9d86b95d08fbf1396afc1e0f64f212b6 /arch/x86/kernel/setup.c | |
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/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 @@ | |||
118 | #include <asm/highmem.h> | 118 | #include <asm/highmem.h> |
119 | #endif | 119 | #endif |
120 | 120 | ||
121 | #ifndef CONFIG_DEBUG_BOOT_PARAMS | ||
122 | struct boot_params __initdata boot_params; | ||
123 | #else | ||
124 | struct boot_params boot_params; | ||
125 | #endif | ||
126 | |||
121 | /* This value is set up by the early boot code to point to the value | 127 | /* This value is set up by the early boot code to point to the value |
122 | immediately after the boot time page tables. It contains a *physical* | 128 | immediately after the boot time page tables. It contains a *physical* |
123 | address, and must not be in the .bss segment! */ | 129 | address, and must not be in the .bss segment! */ |