git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
m68knommu
/
mm
/
init.c
diff --git
a/arch/m68knommu/mm/init.c
b/arch/m68knommu/mm/init.c
index
ce33f2f
..
89f0b55
100644
(file)
--- a/
arch/m68knommu/mm/init.c
+++ b/
arch/m68knommu/mm/init.c
@@
-38,7
+38,6
@@
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/machdep.h>
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/machdep.h>
-#include <asm/shglcore.h>
#undef DEBUG
#undef DEBUG
@@
-169,7
+168,7
@@
void mem_init(void)
high_memory = (void *) end_mem;
start_mem = PAGE_ALIGN(start_mem);
high_memory = (void *) end_mem;
start_mem = PAGE_ALIGN(start_mem);
- max_mapnr = num_physpages =
MAP_NR(high_memory)
;
+ max_mapnr = num_physpages =
(((unsigned long) high_memory) - PAGE_OFFSET) >> PAGE_SHIFT
;
/* this will put all memory onto the freelists */
totalram_pages = free_all_bootmem();
/* this will put all memory onto the freelists */
totalram_pages = free_all_bootmem();