Merge branch 'akpm-current/current'

[karo-tx-linux.git] / include / linux / memory.h

diff --git a/include/linux/memory.h b/include/linux/memory.h
index 8b8d8d12348e59219dbbce03c22a749a49368deb..82730adba950ed196bb7006fa953704393f6578e 100644 (file)
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -109,6 +109,9 @@ extern void unregister_memory_notifier(struct notifier_block *nb);
 extern int register_memory_isolate_notifier(struct notifier_block *nb);
 extern void unregister_memory_isolate_notifier(struct notifier_block *nb);
 extern int register_new_memory(int, struct mem_section *);
+extern int memory_block_change_state(struct memory_block *mem,
+                                    unsigned long to_state,
+                                    unsigned long from_state_req);
 #ifdef CONFIG_MEMORY_HOTREMOVE
 extern int unregister_memory_section(struct mem_section *);
 #endif