git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../linux-2.6-watchdog-mm
[pandora-kernel.git]
/
arch
/
i386
/
mm
/
init.c
diff --git
a/arch/i386/mm/init.c
b/arch/i386/mm/init.c
index
84697df
..
c5c5ea7
100644
(file)
--- a/
arch/i386/mm/init.c
+++ b/
arch/i386/mm/init.c
@@
-283,7
+283,7
@@
void __init add_one_highpage_init(struct page *page, int pfn, int bad_ppro)
SetPageReserved(page);
}
SetPageReserved(page);
}
-static int add_one_highpage_hotplug(struct page *page, unsigned long pfn)
+static int
__meminit
add_one_highpage_hotplug(struct page *page, unsigned long pfn)
{
free_new_highpage(page);
totalram_pages++;
{
free_new_highpage(page);
totalram_pages++;
@@
-300,7
+300,7
@@
static int add_one_highpage_hotplug(struct page *page, unsigned long pfn)
* has been added dynamically that would be
* onlined here is in HIGHMEM
*/
* has been added dynamically that would be
* onlined here is in HIGHMEM
*/
-void online_page(struct page *page)
+void
__meminit
online_page(struct page *page)
{
ClearPageReserved(page);
add_one_highpage_hotplug(page, page_to_pfn(page));
{
ClearPageReserved(page);
add_one_highpage_hotplug(page, page_to_pfn(page));
@@
-673,16
+673,10
@@
void __init mem_init(void)
#endif
}
#endif
}
-/*
- * this is for the non-NUMA, single node SMP system case.
- * Specifically, in the case of x86, we will always add
- * memory to the highmem for now.
- */
#ifdef CONFIG_MEMORY_HOTPLUG
#ifdef CONFIG_MEMORY_HOTPLUG
-#ifndef CONFIG_NEED_MULTIPLE_NODES
int arch_add_memory(int nid, u64 start, u64 size)
{
int arch_add_memory(int nid, u64 start, u64 size)
{
- struct pglist_data *pgdata =
&contig_page_data
;
+ struct pglist_data *pgdata =
NODE_DATA(nid)
;
struct zone *zone = pgdata->node_zones + ZONE_HIGHMEM;
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long nr_pages = size >> PAGE_SHIFT;
struct zone *zone = pgdata->node_zones + ZONE_HIGHMEM;
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long nr_pages = size >> PAGE_SHIFT;
@@
-694,7
+688,7
@@
int remove_memory(u64 start, u64 size)
{
return -EINVAL;
}
{
return -EINVAL;
}
-#endif
+EXPORT_SYMBOL_GPL(remove_memory);
#endif
struct kmem_cache *pgd_cache;
#endif
struct kmem_cache *pgd_cache;