diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-01-15 12:28:17 +0100 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-01-15 12:28:17 +0100 |
| commit | 597fb188cbee2d371246e1669bbc6051bb666aa9 (patch) | |
| tree | fd9cb605050ca15274cf391dc6bd4073d04808df /include | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 (diff) | |
| parent | slub: Avoid use of slub_lock in show_slab_objects() (diff) | |
| download | linux-597fb188cbee2d371246e1669bbc6051bb666aa9.tar.xz linux-597fb188cbee2d371246e1669bbc6051bb666aa9.zip | |
Merge branch 'slub/hotplug' into slab/urgent
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/memory_hotplug.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 24376fe7ee68..8122018d3000 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -165,6 +165,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); |