diff options
| author | Matt Tolentino <metolent@snoqualmie.dp.intel.com> | 2005-06-23 00:08:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 09:45:06 -0700 |
| commit | 073326634bec2f36e165583d21fb0a9fad47ac0a (patch) | |
| tree | c72cfdd09647d5f709d26986155224ad6e27294c /arch/x86_64 | |
| parent | 145e664231648121026d470094c200851a446a73 (diff) | |
| download | op-kernel-dev-073326634bec2f36e165583d21fb0a9fad47ac0a.zip op-kernel-dev-073326634bec2f36e165583d21fb0a9fad47ac0a.tar.gz | |
[PATCH] remove direct ref to contig_page_data for x86-64
This patch pulls out all remaining direct references to contig_page_data
from arch/x86-64, thus saving an ifdef in one case.
Signed-off-by: Matt Tolentino <matthew.e.tolentino@intel.com>
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/kernel/aperture.c | 4 | ||||
| -rw-r--r-- | arch/x86_64/kernel/setup.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86_64/kernel/aperture.c b/arch/x86_64/kernel/aperture.c index 504e634..c9a6b81 100644 --- a/arch/x86_64/kernel/aperture.c +++ b/arch/x86_64/kernel/aperture.c @@ -40,11 +40,7 @@ int fix_aperture __initdata = 1; static u32 __init allocate_aperture(void) { -#ifdef CONFIG_DISCONTIGMEM pg_data_t *nd0 = NODE_DATA(0); -#else - pg_data_t *nd0 = &contig_page_data; -#endif u32 aper_size; void *p; diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 99f038ed..125a0bb 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c @@ -386,7 +386,7 @@ static void __init contig_initmem_init(void) if (bootmap == -1L) panic("Cannot find bootmem map of size %ld\n",bootmap_size); bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, end_pfn); - e820_bootmem_free(&contig_page_data, 0, end_pfn << PAGE_SHIFT); + e820_bootmem_free(NODE_DATA(0), 0, end_pfn << PAGE_SHIFT); reserve_bootmem(bootmap, bootmap_size); } #endif |
