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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
arch
/
powerpc
/
mm
/
mem.c
diff --git
a/arch/powerpc/mm/mem.c
b/arch/powerpc/mm/mem.c
index
1b44f7b
..
457b7ee
100644
(file)
--- a/
arch/powerpc/mm/mem.c
+++ b/
arch/powerpc/mm/mem.c
@@
-18,6
+18,7
@@
*
*/
*
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/kernel.h>
@@
-114,20
+115,15
@@
void online_page(struct page *page)
num_physpages++;
}
num_physpages++;
}
-#ifdef CONFIG_NUMA
-int memory_add_physaddr_to_nid(u64 start)
-{
- return hot_add_scn_to_nid(start);
-}
-#endif
-
-int __devinit arch_add_memory(int nid, u64 start, u64 size)
+int __devinit add_memory(u64 start, u64 size)
{
struct pglist_data *pgdata;
struct zone *zone;
{
struct pglist_data *pgdata;
struct zone *zone;
+ int nid;
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long nr_pages = size >> PAGE_SHIFT;
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long nr_pages = size >> PAGE_SHIFT;
+ nid = hot_add_scn_to_nid(start);
pgdata = NODE_DATA(nid);
start = (unsigned long)__va(start);
pgdata = NODE_DATA(nid);
start = (unsigned long)__va(start);
@@
-304,9
+300,9
@@
void __init paging_init(void)
kmap_prot = PAGE_KERNEL;
#endif /* CONFIG_HIGHMEM */
kmap_prot = PAGE_KERNEL;
#endif /* CONFIG_HIGHMEM */
- printk(KERN_
DEBUG
"Top of RAM: 0x%lx, Total RAM: 0x%lx\n",
+ printk(KERN_
INFO
"Top of RAM: 0x%lx, Total RAM: 0x%lx\n",
top_of_ram, total_ram);
top_of_ram, total_ram);
- printk(KERN_
DEBUG
"Memory hole size: %ldMB\n",
+ printk(KERN_
INFO
"Memory hole size: %ldMB\n",
(top_of_ram - total_ram) >> 20);
/*
* All pages are DMA-able so we put them all in the DMA zone.
(top_of_ram - total_ram) >> 20);
/*
* All pages are DMA-able so we put them all in the DMA zone.
@@
-398,7
+394,7
@@
void __init mem_init(void)
totalhigh_pages++;
}
totalram_pages += totalhigh_pages;
totalhigh_pages++;
}
totalram_pages += totalhigh_pages;
- printk(KERN_
DEBUG
"High memory: %luk\n",
+ printk(KERN_
INFO
"High memory: %luk\n",
totalhigh_pages << (PAGE_SHIFT-10));
}
#endif /* CONFIG_HIGHMEM */
totalhigh_pages << (PAGE_SHIFT-10));
}
#endif /* CONFIG_HIGHMEM */