The patch titled
slab-fix-lockdep-warnings fix
has been removed from the -mm tree. Its filename is
slab-fix-lockdep-warnings-fix.patch
This patch was dropped because it was folded into slab-fix-lockdep-warnings.patch
------------------------------------------------------
Subject: slab-fix-lockdep-warnings fix
From: Ravikiran G Thirumalai <kiran@xxxxxxxxxxxx>
Fix oops due to alien cache lockdep annotation on non NUMA configurations.
A plain alien != NULL won't work as l3->alien is initialized with
0x01020304ul
Signed-off-by: Ravikiran Thirumalai <kiran@xxxxxxxxxxxx>
Cc: Shai Fultheim <shai@xxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Cc: Christoph Lameter <clameter@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/slab.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff -puN mm/slab.c~slab-fix-lockdep-warnings-fix mm/slab.c
--- a/mm/slab.c~slab-fix-lockdep-warnings-fix
+++ a/mm/slab.c
@@ -674,6 +674,8 @@ static struct kmem_cache cache_cache = {
#endif
};
+#define BAD_ALIEN_MAGIC 0x01020304ul
+
#ifdef CONFIG_LOCKDEP
/*
@@ -705,7 +707,14 @@ static inline void init_lock_keys(void)
continue;
lockdep_set_class(&l3->list_lock, &on_slab_l3_key);
alc = l3->alien;
- if (!alc)
+ /*
+ * FIXME: This check for BAD_ALIEN_MAGIC
+ * should go away when common slab code is taught to
+ * work even without alien caches.
+ * Currently, non NUMA code returns BAD_ALIEN_MAGIC
+ * for alloc_alien_cache,
+ */
+ if (!alc || (unsigned long)alc == BAD_ALIEN_MAGIC)
continue;
for_each_node(r) {
if (alc[r])
@@ -1111,7 +1120,7 @@ static inline int cache_free_alien(struc
static inline struct array_cache **alloc_alien_cache(int node, int limit)
{
- return (struct array_cache **) 0x01020304ul;
+ return (struct array_cache **)BAD_ALIEN_MAGIC;
}
static inline void free_alien_cache(struct array_cache **ac_ptr)
_
Patches currently in -mm which might be from kiran@xxxxxxxxxxxx are
add-some-comments-to-slabc.patch
slab-fix-lockdep-warnings.patch
slab-fix-lockdep-warnings-fix.patch
slab-fix-lockdep-warnings-fix-2.patch
slab-fix-kmalloc_node-applying-memory-policies-if-nodeid-==-numa_node_id.patch
slab-leaks3-default-y.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
