projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
alpha: remove DISCONTIGMEM and NUMA
[linux-2.6-microblaze.git]
/
arch
/
alpha
/
mm
/
init.c
diff --git
a/arch/alpha/mm/init.c
b/arch/alpha/mm/init.c
index
a97650a
..
f6114d0
100644
(file)
--- a/
arch/alpha/mm/init.c
+++ b/
arch/alpha/mm/init.c
@@
-235,8
+235,6
@@
callback_init(void * kernel_end)
return kernel_end;
}
return kernel_end;
}
-
-#ifndef CONFIG_DISCONTIGMEM
/*
* paging_init() sets up the memory map.
*/
/*
* paging_init() sets up the memory map.
*/
@@
-257,7
+255,6
@@
void __init paging_init(void)
/* Initialize the kernel's ZERO_PGE. */
memset((void *)ZERO_PGE, 0, PAGE_SIZE);
}
/* Initialize the kernel's ZERO_PGE. */
memset((void *)ZERO_PGE, 0, PAGE_SIZE);
}
-#endif /* CONFIG_DISCONTIGMEM */
#if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_SRM)
void
#if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_SRM)
void