diff options
author | Matt Tolentino <metolent@snoqualmie.dp.intel.com> | 2005-06-23 03:08:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 12:45:06 -0400 |
commit | 073326634bec2f36e165583d21fb0a9fad47ac0a (patch) | |
tree | c72cfdd09647d5f709d26986155224ad6e27294c /arch/x86_64/kernel/aperture.c | |
parent | 145e664231648121026d470094c200851a446a73 (diff) |
[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/kernel/aperture.c')
-rw-r--r-- | arch/x86_64/kernel/aperture.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86_64/kernel/aperture.c b/arch/x86_64/kernel/aperture.c index 504e6347499..c9a6b812e92 100644 --- a/arch/x86_64/kernel/aperture.c +++ b/arch/x86_64/kernel/aperture.c | |||
@@ -40,11 +40,7 @@ int fix_aperture __initdata = 1; | |||
40 | 40 | ||
41 | static u32 __init allocate_aperture(void) | 41 | static u32 __init allocate_aperture(void) |
42 | { | 42 | { |
43 | #ifdef CONFIG_DISCONTIGMEM | ||
44 | pg_data_t *nd0 = NODE_DATA(0); | 43 | pg_data_t *nd0 = NODE_DATA(0); |
45 | #else | ||
46 | pg_data_t *nd0 = &contig_page_data; | ||
47 | #endif | ||
48 | u32 aper_size; | 44 | u32 aper_size; |
49 | void *p; | 45 | void *p; |
50 | 46 | ||