lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86/cleanups' into irq/sparseirq

Browse Source 
Reason: Avoid conflicts with removal of boot_cpu_id

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2010-10-12 16:40:34 +02:00
parent 8ffcfa4e2d 234bb549ee
commit 5e62feabcc
16 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/kernel/setup.c
View File

@@ -125,7 +125,6 @@ unsigned long max_pfn_mapped;
RESERVE_BRK(dmi_alloc, 65536);
#endif
unsigned int boot_cpu_id __read_mostly;
static __initdata unsigned long _brk_start = (unsigned long)__brk_base;
unsigned long _brk_end = (unsigned long)__brk_base;