projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[powerpc.git]
/
arch
/
x86_64
/
kernel
/
aperture.c
diff --git
a/arch/x86_64/kernel/aperture.c
b/arch/x86_64/kernel/aperture.c
index
504e634
..
c9a6b81
100644
(file)
--- 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;