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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
mips
/
sgi-ip27
/
ip27-memory.c
diff --git
a/arch/mips/sgi-ip27/ip27-memory.c
b/arch/mips/sgi-ip27/ip27-memory.c
index
0a44a98
..
6c00dce
100644
(file)
--- a/
arch/mips/sgi-ip27/ip27-memory.c
+++ b/
arch/mips/sgi-ip27/ip27-memory.c
@@
-19,6
+19,7
@@
#include <linux/nodemask.h>
#include <linux/swap.h>
#include <linux/bootmem.h>
#include <linux/nodemask.h>
#include <linux/swap.h>
#include <linux/bootmem.h>
+#include <linux/pfn.h>
#include <asm/page.h>
#include <asm/sections.h>
#include <asm/page.h>
#include <asm/sections.h>
@@
-28,8
+29,6
@@
#include <asm/sn/sn_private.h>
#include <asm/sn/sn_private.h>
-#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
-
#define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT)
#define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT)
#define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT)
#define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT)
@@
-538,10
+537,10
@@
void __init mem_init(void)
for_each_online_node(node) {
unsigned slot, numslots;
struct page *end, *p;
for_each_online_node(node) {
unsigned slot, numslots;
struct page *end, *p;
-
+
/*
/*
- * This will free up the bootmem, ie, slot 0 memory.
- */
+ * This will free up the bootmem, ie, slot 0 memory.
+ */
totalram_pages += free_all_bootmem_node(NODE_DATA(node));
/*
totalram_pages += free_all_bootmem_node(NODE_DATA(node));
/*
@@
-549,9
+548,8
@@
void __init mem_init(void)
*/
numslots = node_getlastslot(node);
for (slot = 1; slot <= numslots; slot++) {
*/
numslots = node_getlastslot(node);
for (slot = 1; slot <= numslots; slot++) {
- p = NODE_DATA(node)->node_mem_map +
- (slot_getbasepfn(node, slot) -
- slot_getbasepfn(node, 0));
+ p = nid_page_nr(node, slot_getbasepfn(node, slot) -
+ slot_getbasepfn(node, 0));
/*
* Free valid memory in current slot.
/*
* Free valid memory in current slot.
@@
-560,7
+558,7
@@
void __init mem_init(void)
/* if (!page_is_ram(pgnr)) continue; */
/* commented out until page_is_ram works */
ClearPageReserved(p);
/* if (!page_is_ram(pgnr)) continue; */
/* commented out until page_is_ram works */
ClearPageReserved(p);
-
set_page_count(p, 1
);
+
init_page_count(p
);
__free_page(p);
totalram_pages++;
}
__free_page(p);
totalram_pages++;
}