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>
This commit is contained in:
@@ -118,6 +118,12 @@
|
|||||||
#include <asm/highmem.h>
|
#include <asm/highmem.h>
|
||||||
#endif
|
#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
|
/* 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*
|
immediately after the boot time page tables. It contains a *physical*
|
||||||
address, and must not be in the .bss segment! */
|
address, and must not be in the .bss segment! */
|
||||||
|
@@ -15,12 +15,6 @@
|
|||||||
#include <asm/apicdef.h>
|
#include <asm/apicdef.h>
|
||||||
#include <asm/highmem.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
|
#ifdef CONFIG_X86_LOCAL_APIC
|
||||||
unsigned int num_processors;
|
unsigned int num_processors;
|
||||||
unsigned disabled_cpus __cpuinitdata;
|
unsigned disabled_cpus __cpuinitdata;
|
||||||
|
Reference in New Issue
Block a user