diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-15 22:01:14 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-15 22:01:14 +0100 |
| commit | 1b59be2a6cdcb5a12e18d8315c07c94a624de48f (patch) | |
| tree | 5cf48d9f94d85e9b1f984610b6868ad100ca1916 /include | |
| parent | Merge branches 'core-fixes-for-linus', 'x86-fixes-for-linus', 'timers-fixes-f... (diff) | |
| parent | Update Pekka's email address in MAINTAINERS (diff) | |
| download | linux-1b59be2a6cdcb5a12e18d8315c07c94a624de48f.tar.xz linux-1b59be2a6cdcb5a12e18d8315c07c94a624de48f.zip | |
Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
Update Pekka's email address in MAINTAINERS
mm/slab.c: make local symbols static
slub: Avoid use of slub_lock in show_slab_objects()
memory hotplug: one more lock on memory hotplug
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); |