From adf76c13f7f5377de70ce12f8c53e8e865d2e5a2 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Wed, 25 Mar 2009 11:05:57 +0200
Subject: [PATCH] --- yaml --- r: 142237 b: refs/heads/master c:
 2121db74ba0fd2259f0e2265511684fadda9ac49 h: refs/heads/master i:   142235:
 d4978a0708eae54991849a50dc7b1dd36c2b7728 v: v3

---
 [refs]          | 2 +-
 trunk/mm/slab.c | 4 ++--
 trunk/mm/slob.c | 4 ++--
 trunk/mm/slub.c | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f5a516188481..56454d0491f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c826e3cd0c931d60d548f2468122da570d145556
+refs/heads/master: 2121db74ba0fd2259f0e2265511684fadda9ac49
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index fa00fd6a644d..b58400285030 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -3773,6 +3773,8 @@ void kfree(const void *objp)
 	struct kmem_cache *c;
 	unsigned long flags;
 
+	trace_kfree(_RET_IP_, objp);
+
 	if (unlikely(ZERO_OR_NULL_PTR(objp)))
 		return;
 	local_irq_save(flags);
@@ -3782,8 +3784,6 @@ void kfree(const void *objp)
 	debug_check_no_obj_freed(objp, obj_size(c));
 	__cache_free(c, (void *)objp);
 	local_irq_restore(flags);
-
-	trace_kfree(_RET_IP_, objp);
 }
 EXPORT_SYMBOL(kfree);
 
diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c
index 00003587ebfa..a2d4ab32198d 100644
--- a/trunk/mm/slob.c
+++ b/trunk/mm/slob.c
@@ -514,6 +514,8 @@ void kfree(const void *block)
 {
 	struct slob_page *sp;
 
+	trace_kfree(_RET_IP_, block);
+
 	if (unlikely(ZERO_OR_NULL_PTR(block)))
 		return;
 
@@ -524,8 +526,6 @@ void kfree(const void *block)
 		slob_free(m, *m + align);
 	} else
 		put_page(&sp->page);
-
-	trace_kfree(_RET_IP_, block);
 }
 EXPORT_SYMBOL(kfree);
 
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index a98078bf738b..7ab54ecbd3f3 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -2792,6 +2792,8 @@ void kfree(const void *x)
 	struct page *page;
 	void *object = (void *)x;
 
+	trace_kfree(_RET_IP_, x);
+
 	if (unlikely(ZERO_OR_NULL_PTR(x)))
 		return;
 
@@ -2802,8 +2804,6 @@ void kfree(const void *x)
 		return;
 	}
 	slab_free(page->slab, page, object, _RET_IP_);
-
-	trace_kfree(_RET_IP_, x);
 }
 EXPORT_SYMBOL(kfree);