From: Nadia Derbey <Nadia.Derbey@bull.net>
Date: Tue, 29 Apr 2008 08:00:41 +0000 (-0700)
Subject: ipc: define the slab_memory_callback priority as a constant
X-Git-Tag: v2.6.26-rc1~547
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0c40ba4fd64f98e7a5cba8ffaedbd68642a85700;p=linux-2.6-omap-h63xx.git

ipc: define the slab_memory_callback priority as a constant

This is a trivial patch that defines the priority of slab_memory_callback in
the callback chain as a constant.  This is to prepare for next patch in the
series.

Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: Mingming Cao <cmm@us.ibm.com>
Cc: Pierre Peiffer <pierre.peiffer@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/linux/memory.h b/include/linux/memory.h
index f80e0e331cb..39628dfe4a4 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -53,6 +53,12 @@ struct memory_notify {
 struct notifier_block;
 struct mem_section;
 
+/*
+ * Priorities for the hotplug memory callback routines (stored in decreasing
+ * order in the callback chain)
+ */
+#define SLAB_CALLBACK_PRI       1
+
 #ifndef CONFIG_MEMORY_HOTPLUG_SPARSE
 static inline int memory_dev_init(void)
 {
diff --git a/mm/slub.c b/mm/slub.c
index 992ecd4f0d3..b145e798bf3 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2978,7 +2978,7 @@ void __init kmem_cache_init(void)
 	kmalloc_caches[0].refcount = -1;
 	caches++;
 
-	hotplug_memory_notifier(slab_memory_callback, 1);
+	hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI);
 #endif
 
 	/* Able to allocate the per node structures */