From 93452a3ff32084687268643822f39ff2d1d053f9 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung@gmail.com>
Date: Wed, 29 Sep 2010 21:02:14 +0900
Subject: [PATCH] --- yaml --- r: 215954 b: refs/heads/master c:
 3478973dedee5e957c45dc93c11d12dc3f733ee0 h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 569228fda837..526001e98d60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5dd5c117cbf620378d693963ffc42239297fac4
+refs/heads/master: 3478973dedee5e957c45dc93c11d12dc3f733ee0
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index ac236b1ced16..118422e220f0 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -1446,6 +1446,7 @@ static struct page *get_partial(struct kmem_cache *s, gfp_t flags, int node)
  * On exit the slab lock will have been dropped.
  */
 static void unfreeze_slab(struct kmem_cache *s, struct page *page, int tail)
+	__releases(bitlock)
 {
 	struct kmem_cache_node *n = get_node(s, page_to_nid(page));
 
@@ -1488,6 +1489,7 @@ static void unfreeze_slab(struct kmem_cache *s, struct page *page, int tail)
  * Remove the cpu slab
  */
 static void deactivate_slab(struct kmem_cache *s, struct kmem_cache_cpu *c)
+	__releases(bitlock)
 {
 	struct page *page = c->page;
 	int tail = 1;