Driver core: Merge 2.6.37-rc2 into driver-core-next

This resolves some build issues that were present in the older -rc1
tree that kept bothering me.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 2 insertions, 1 deletions

diff --git a/mm/slub.c b/mm/slub.c
index 8fd5401bb071..981fb730aa04 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3273,9 +3273,9 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
                 kfree(n);
                 kfree(s);
         }
+err:
         up_write(&slub_lock);
 
-err:
         if (flags & SLAB_PANIC)
                 panic("Cannot create slabcache %s\n", name);
         else
@@ -3862,6 +3862,7 @@ static ssize_t show_slab_objects(struct kmem_cache *s,
                         x += sprintf(buf + x, " N%d=%lu",
                                         node, nodes[node]);
 #endif
+        up_read(&slub_lock);
         kfree(nodes);
         return x + sprintf(buf + x, "\n");
 }