diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 17:22:45 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 17:22:45 -0400 |
| commit | d25e6b0b326278a1096e8334584c3e64517057a3 (patch) | |
| tree | 3c914b877adf9615c7158b58705478e56c9b4247 /arch/x86/kernel/setup.c | |
| parent | e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4 (diff) | |
| parent | 40ffa93791985ab300fd488072e9f37ccf72e88c (diff) | |
Merge branch 'x86/cleanups' into x86/trampoline
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 feb4c21e499a..322b24fbeafd 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -124,7 +124,6 @@ unsigned long max_pfn_mapped; | |||
| 124 | RESERVE_BRK(dmi_alloc, 65536); | 124 | RESERVE_BRK(dmi_alloc, 65536); |
| 125 | #endif | 125 | #endif |
| 126 | 126 | ||
| 127 | unsigned int boot_cpu_id __read_mostly; | ||
| 128 | 127 | ||
| 129 | static __initdata unsigned long _brk_start = (unsigned long)__brk_base; | 128 | static __initdata unsigned long _brk_start = (unsigned long)__brk_base; |
| 130 | unsigned long _brk_end = (unsigned long)__brk_base; | 129 | unsigned long _brk_end = (unsigned long)__brk_base; |