diff options
| author | Michal Simek <monstr@monstr.eu> | 2011-01-10 09:29:29 +0100 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2011-01-10 09:29:29 +0100 |
| commit | 20c040ce2176be4be250503497a0a103a3fb3b3e (patch) | |
| tree | fce5d1cf5860ea2aeb292736fd373da8e2ea5a98 /include/linux/memory_hotplug.h | |
| parent | 7f01af04bdf59448f3d75744d7ad9713331bd0f7 (diff) | |
| parent | 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (diff) | |
Merge commit 'v2.6.37' into next
Diffstat (limited to 'include/linux/memory_hotplug.h')
| -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 4307231bd22f..31c237a00c48 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -161,6 +161,9 @@ extern void register_page_bootmem_info_node(struct pglist_data *pgdat); extern void put_page_bootmem(struct page *page); #endif +void lock_memory_hotplug(void); +void unlock_memory_hotplug(void); + #else /* ! CONFIG_MEMORY_HOTPLUG */ /* * Stub functions for when hotplug is off @@ -192,6 +195,9 @@ static inline void register_page_bootmem_info_node(struct pglist_data *pgdat) { } +static inline void lock_memory_hotplug(void) {} +static inline void unlock_memory_hotplug(void) {} + #endif /* ! CONFIG_MEMORY_HOTPLUG */ #ifdef CONFIG_MEMORY_HOTREMOVE |