This is definition for pgdat_remove_read_lock() & read_lock_sleepable().


Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>


---
 include/linux/memory_hotplug.h |   25 +++++++++++++++++++++++++
 mm/memory_hotplug.c            |   12 ++++++++++++
 2 files changed, 37 insertions(+)

Index: current/include/linux/memory_hotplug.h
===================================================================
--- current.orig/include/linux/memory_hotplug.h	2008-07-29 21:19:13.000000000 +0900
+++ current/include/linux/memory_hotplug.h	2008-07-29 21:19:17.000000000 +0900
@@ -20,6 +20,31 @@ struct mem_section;
 #define MIX_SECTION_INFO	(-1 - 2)
 #define NODE_INFO		(-1 - 3)
 
+#if (defined CONFIG_NUMA && CONFIG_MEMORY_HOTREMOVE)
+/*
+ * pgdat removing lock
+ */
+extern struct srcu_struct pgdat_remove_srcu;
+#define pgdat_remove_read_lock() rcu_read_lock()
+#define pgdat_remove_read_unlock() rcu_read_unlock()
+#define pgdat_remove_read_lock_sleepable() srcu_read_lock(&pgdat_remove_srcu)
+#define pgdat_remove_read_unlock_sleepable(idx) \
+	srcu_read_unlock(&pgdat_remove_srcu, idx)
+#else
+static inline void pgdat_remove_read_lock(void)
+{
+}
+static inline void pgdat_remove_read_unlock(void)
+{
+}
+static inline int pgdat_remove_read_lock_sleepable(void)
+{
+}
+static inline void pgdat_remove_read_unlock_sleepable(int idx)
+{
+}
+#endif
+
 /*
  * pgdat resizing functions
  */
Index: current/mm/memory_hotplug.c
===================================================================
--- current.orig/mm/memory_hotplug.c	2008-07-29 21:19:13.000000000 +0900
+++ current/mm/memory_hotplug.c	2008-07-29 22:17:38.000000000 +0900
@@ -31,6 +31,10 @@
 
 #include "internal.h"
 
+#if (defined CONFIG_NUMA && CONFIG_MEMORY_HOTREMOVE)
+struct srcu_struct pgdat_remove_srcu;
+#endif
+
 /* add this memory to iomem resource */
 static struct resource *register_memory_resource(u64 start, u64 size)
 {
@@ -850,6 +854,14 @@ failed_removal:
 
 	return ret;
 }
+
+static int __init init_pgdat_remove_lock_sleepable(void)
+{
+	init_srcu_struct(&pgdat_remove_srcu);
+	return 0;
+}
+
+subsys_initcall(init_pgdat_remove_lock_sleepable);
 #else
 int remove_memory(u64 start, u64 size)
 {

-- 
Yasunori Goto 


--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/