diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-19 20:27:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-19 20:27:25 -0800 |
| commit | 12fcdba1b7ae8b25696433f420b775aeb556d89b (patch) | |
| tree | 2826a8e5ebce9296ae8a53f2eb35c49946aadeee /arch/x86/mm/srat_32.c | |
| parent | 1268afe676ee9431a229fc68a2efb0dad4d5852f (diff) | |
| parent | 9032160275ba018003ff390835ff8ed2b5b788b8 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Unify "numa=" command line option handling
Revert "x86: Make relocatable kernel work with new binutils"
Diffstat (limited to 'arch/x86/mm/srat_32.c')
| -rw-r--r-- | arch/x86/mm/srat_32.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c index f16434568a51..ae96e7b8051d 100644 --- a/arch/x86/mm/srat_32.c +++ b/arch/x86/mm/srat_32.c @@ -59,7 +59,6 @@ static struct node_memory_chunk_s __initdata node_memory_chunk[MAXCHUNKS]; static int __initdata num_memory_chunks; /* total number of memory chunks */ static u8 __initdata apicid_to_pxm[MAX_APICID]; -int numa_off __initdata; int acpi_numa __initdata; static __init void bad_srat(void) |