Messages in this thread Patch in this message | | | From | Yinghai Lu <> | Subject | [PATCH 09/16] x86: move boot_params back to setup.c | Date | Wed, 25 Jun 2008 17:55:20 -0700 |
| |
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
--- arch/x86/kernel/setup.c | 6 ++++++ arch/x86/kernel/setup_percpu.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-)
Index: linux-2.6/arch/x86/kernel/setup.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/setup.c +++ linux-2.6/arch/x86/kernel/setup.c @@ -114,6 +114,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! */ Index: linux-2.6/arch/x86/kernel/setup_percpu.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/setup_percpu.c +++ linux-2.6/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;
| |