git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eCryptfs: Add getattr function
[safe/jmp/linux-2.6]
/
mm
/
memory_hotplug.c
diff --git
a/mm/memory_hotplug.c
b/mm/memory_hotplug.c
index
380aef4
..
030ce8a
100644
(file)
--- a/
mm/memory_hotplug.c
+++ b/
mm/memory_hotplug.c
@@
-26,6
+26,8
@@
#include <linux/migrate.h>
#include <linux/page-isolation.h>
#include <linux/pfn.h>
#include <linux/migrate.h>
#include <linux/page-isolation.h>
#include <linux/pfn.h>
+#include <linux/suspend.h>
+#include <linux/mm_inline.h>
#include <asm/tlbflush.h>
#include <asm/tlbflush.h>
@@
-70,7
+72,9
@@
static void get_page_bootmem(unsigned long info, struct page *page, int type)
atomic_inc(&page->_count);
}
atomic_inc(&page->_count);
}
-void put_page_bootmem(struct page *page)
+/* reference to __meminit __free_pages_bootmem is valid
+ * so use __ref to tell modpost not to generate a warning */
+void __ref put_page_bootmem(struct page *page)
{
int type;
{
int type;
@@
-485,14
+489,18
@@
int __ref add_memory(int nid, u64 start, u64 size)
struct resource *res;
int ret;
struct resource *res;
int ret;
+ lock_system_sleep();
+
res = register_memory_resource(start, size);
res = register_memory_resource(start, size);
+ ret = -EEXIST;
if (!res)
if (!res)
-
return -EEXIST
;
+
goto out
;
if (!node_online(nid)) {
pgdat = hotadd_new_pgdat(nid, start);
if (!node_online(nid)) {
pgdat = hotadd_new_pgdat(nid, start);
+ ret = -ENOMEM;
if (!pgdat)
if (!pgdat)
-
return -ENOMEM
;
+
goto out
;
new_pgdat = 1;
}
new_pgdat = 1;
}
@@
-515,7
+523,8
@@
int __ref add_memory(int nid, u64 start, u64 size)
BUG_ON(ret);
}
BUG_ON(ret);
}
- return ret;
+ goto out;
+
error:
/* rollback pgdat allocation and others */
if (new_pgdat)
error:
/* rollback pgdat allocation and others */
if (new_pgdat)
@@
-523,6
+532,8
@@
error:
if (res)
release_memory_resource(res);
if (res)
release_memory_resource(res);
+out:
+ unlock_system_sleep();
return ret;
}
EXPORT_SYMBOL_GPL(add_memory);
return ret;
}
EXPORT_SYMBOL_GPL(add_memory);
@@
-664,6
+675,9
@@
do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
if (!ret) { /* Success */
list_add_tail(&page->lru, &source);
move_pages--;
if (!ret) { /* Success */
list_add_tail(&page->lru, &source);
move_pages--;
+ inc_zone_page_state(page, NR_ISOLATED_ANON +
+ page_is_file_cache(page));
+
} else {
/* Becasue we don't have big zone->lock. we should
check this again here. */
} else {
/* Becasue we don't have big zone->lock. we should
check this again here. */
@@
-686,7
+700,7
@@
do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
if (list_empty(&source))
goto out;
/* this function returns # of failed pages */
if (list_empty(&source))
goto out;
/* this function returns # of failed pages */
- ret = migrate_pages(&source, hotremove_migrate_alloc, 0);
+ ret = migrate_pages(&source, hotremove_migrate_alloc, 0
, 1
);
out:
return ret;
out:
return ret;
@@
-739,7
+753,7
@@
check_pages_isolated(unsigned long start_pfn, unsigned long end_pfn)
return offlined;
}
return offlined;
}
-int offline_pages(unsigned long start_pfn,
+
static
int offline_pages(unsigned long start_pfn,
unsigned long end_pfn, unsigned long timeout)
{
unsigned long pfn, nr_pages, expire;
unsigned long end_pfn, unsigned long timeout)
{
unsigned long pfn, nr_pages, expire;
@@
-759,6
+773,8
@@
int offline_pages(unsigned long start_pfn,
if (!test_pages_in_a_zone(start_pfn, end_pfn))
return -EINVAL;
if (!test_pages_in_a_zone(start_pfn, end_pfn))
return -EINVAL;
+ lock_system_sleep();
+
zone = page_zone(pfn_to_page(start_pfn));
node = zone_to_nid(zone);
nr_pages = end_pfn - start_pfn;
zone = page_zone(pfn_to_page(start_pfn));
node = zone_to_nid(zone);
nr_pages = end_pfn - start_pfn;
@@
-766,7
+782,7
@@
int offline_pages(unsigned long start_pfn,
/* set above range as isolated */
ret = start_isolate_page_range(start_pfn, end_pfn);
if (ret)
/* set above range as isolated */
ret = start_isolate_page_range(start_pfn, end_pfn);
if (ret)
-
return re
t;
+
goto ou
t;
arg.start_pfn = start_pfn;
arg.nr_pages = nr_pages;
arg.start_pfn = start_pfn;
arg.nr_pages = nr_pages;
@@
-839,11
+855,16
@@
repeat:
setup_per_zone_wmarks();
calculate_zone_inactive_ratio(zone);
setup_per_zone_wmarks();
calculate_zone_inactive_ratio(zone);
+ if (!node_present_pages(node)) {
+ node_clear_state(node, N_HIGH_MEMORY);
+ kswapd_stop(node);
+ }
vm_total_pages = nr_free_pagecache_pages();
writeback_set_ratelimit();
memory_notify(MEM_OFFLINE, &arg);
vm_total_pages = nr_free_pagecache_pages();
writeback_set_ratelimit();
memory_notify(MEM_OFFLINE, &arg);
+ unlock_system_sleep();
return 0;
failed_removal:
return 0;
failed_removal:
@@
-853,6
+874,8
@@
failed_removal:
/* pushback to free area */
undo_isolate_page_range(start_pfn, end_pfn);
/* pushback to free area */
undo_isolate_page_range(start_pfn, end_pfn);
+out:
+ unlock_system_sleep();
return ret;
}
return ret;
}