diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 10:40:34 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 10:40:42 -0400 |
| commit | 5e62feabcc3e4127a084701ec54ffe891985b7e8 (patch) | |
| tree | 9246462da99ef4eb53c9c89a137d0a88c897f3d6 /arch/x86/kernel/setup.c | |
| parent | 8ffcfa4e2d96342180e02dfe1230b97778c52d72 (diff) | |
| parent | 234bb549eea16ec7d5207ba747fb8dbf489e64c1 (diff) | |
Merge branch 'x86/cleanups' into irq/sparseirq
Reason: Avoid conflicts with removal of boot_cpu_id
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index c3a4fbb2b996..7d5ee08c982d 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -125,7 +125,6 @@ unsigned long max_pfn_mapped; | |||
| 125 | RESERVE_BRK(dmi_alloc, 65536); | 125 | RESERVE_BRK(dmi_alloc, 65536); |
| 126 | #endif | 126 | #endif |
| 127 | 127 | ||
| 128 | unsigned int boot_cpu_id __read_mostly; | ||
| 129 | 128 | ||
| 130 | static __initdata unsigned long _brk_start = (unsigned long)__brk_base; | 129 | static __initdata unsigned long _brk_start = (unsigned long)__brk_base; |
| 131 | unsigned long _brk_end = (unsigned long)__brk_base; | 130 | unsigned long _brk_end = (unsigned long)__brk_base; |