From: Namhyung Kim <namhyung@gmail.com>
Date: Wed, 29 Sep 2010 12:02:14 +0000 (+0900)
Subject: slub: Add lock release annotation
X-Git-Tag: upstream/snapshot3+hdmi~12683^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3478973dedee5e957c45dc93c11d12dc3f733ee0;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

slub: Add lock release annotation

The unfreeze_slab() releases page's PG_locked bit but was missing
proper annotation. The deactivate_slab() needs to be marked also
since it calls unfreeze_slab() without grabbing the lock.

Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
---

diff --git a/mm/slub.c b/mm/slub.c
index ac236b1..118422e 100644
--- a/mm/slub.c
+++ b/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;