diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2010-10-22 16:24:06 -0400 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2010-10-22 16:24:06 -0400 |
| commit | 67ba37293e938208795d6a3562201bdb0cf43393 (patch) | |
| tree | 3522e949ff19f3809583bfb3fa3973ddf264689d /arch/x86/kernel/setup.c | |
| parent | cd07202cc8262e1669edff0d97715f3dd9260917 (diff) | |
| parent | 5bba6c56dc99ff88f79a79572e29ecf445710878 (diff) | |
Merge commit 'konrad/stable/xen-pcifront-0.8.2' into 2.6.36-rc8-initial-domain-v6
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; |