From 1ca1ab0625377c5e4cba7e66f4d7bd8f688f0f15 Mon Sep 17 00:00:00 2001
From: Satyam Sharma <satyam@infradead.org>
Date: Tue, 16 Oct 2007 01:24:44 -0700
Subject: [PATCH] --- yaml --- r: 69609 b: refs/heads/master c:
 2408c55037c3f7d51a8a100025c47595e71b838c h: refs/heads/master i:   69607:
 28b7812ba3125238c43ca40d7ca86bd83ef40b8b v: v3

---
 [refs]          | 2 +-
 trunk/mm/slob.c | 6 +++---
 trunk/mm/slub.c | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 4e6f0c077109..744d2daddbf1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c92ff1bde06f69d59b40f3194016aee51cc5da55
+refs/heads/master: 2408c55037c3f7d51a8a100025c47595e71b838c
diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c
index ec33fcdc852e..a886e83e17ef 100644
--- a/trunk/mm/slob.c
+++ b/trunk/mm/slob.c
@@ -360,7 +360,7 @@ static void slob_free(void *block, int size)
 	slobidx_t units;
 	unsigned long flags;
 
-	if (ZERO_OR_NULL_PTR(block))
+	if (unlikely(ZERO_OR_NULL_PTR(block)))
 		return;
 	BUG_ON(!size);
 
@@ -466,7 +466,7 @@ void kfree(const void *block)
 {
 	struct slob_page *sp;
 
-	if (ZERO_OR_NULL_PTR(block))
+	if (unlikely(ZERO_OR_NULL_PTR(block)))
 		return;
 
 	sp = (struct slob_page *)virt_to_page(block);
@@ -484,7 +484,7 @@ size_t ksize(const void *block)
 {
 	struct slob_page *sp;
 
-	if (ZERO_OR_NULL_PTR(block))
+	if (unlikely(ZERO_OR_NULL_PTR(block)))
 		return 0;
 
 	sp = (struct slob_page *)virt_to_page(block);
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index edeb942dc8ae..b7d3664fa3a9 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -2449,7 +2449,7 @@ size_t ksize(const void *object)
 	struct page *page;
 	struct kmem_cache *s;
 
-	if (ZERO_OR_NULL_PTR(object))
+	if (unlikely(ZERO_OR_NULL_PTR(object)))
 		return 0;
 
 	page = get_object_page(object);
@@ -2483,7 +2483,7 @@ void kfree(const void *x)
 {
 	struct page *page;
 
-	if (ZERO_OR_NULL_PTR(x))
+	if (unlikely(ZERO_OR_NULL_PTR(x)))
 		return;
 
 	page = virt_to_head_page(x);
@@ -2800,7 +2800,7 @@ void *__kmalloc_track_caller(size_t size, gfp_t gfpflags, void *caller)
 							get_order(size));
 	s = get_slab(size, gfpflags);
 
-	if (ZERO_OR_NULL_PTR(s))
+	if (unlikely(ZERO_OR_NULL_PTR(s)))
 		return s;
 
 	return slab_alloc(s, gfpflags, -1, caller);
@@ -2816,7 +2816,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
 							get_order(size));
 	s = get_slab(size, gfpflags);
 
-	if (ZERO_OR_NULL_PTR(s))
+	if (unlikely(ZERO_OR_NULL_PTR(s)))
 		return s;
 
 	return slab_alloc(s, gfpflags, node, caller);