summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2011-01-13 12:45:18 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2011-01-13 12:45:18 +1100
commita6d5cbeb43de3908399823644fd391b13eb240e7 (patch)
treefdeda89dc11dec40bfd40bde540b1d4f9e2156ee /include
parent663ca1fcb84f6b39bcdbf9197aa28167845e65ad (diff)
parent06ab9b76ecf2e4796b0b5a88f673cb693b4448d5 (diff)
Merge remote branch 'slab/for-next'
Diffstat (limited to 'include')
-rw-r--r--include/linux/memory_hotplug.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 31c237a00c48..12b9eb5a36c3 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -161,6 +161,12 @@ extern void register_page_bootmem_info_node(struct pglist_data *pgdat);
extern void put_page_bootmem(struct page *page);
#endif
+/*
+ * Lock for memory hotplug guarantees 1) all callbacks for memory hotplug
+ * notifier will be called under this. 2) offline/online/add/remove memory
+ * will not run simultaneously.
+ */
+
void lock_memory_hotplug(void);
void unlock_memory_hotplug(void);