From: Christoph Lameter <clameter@sgi.com>
Date: Fri, 8 Feb 2008 01:47:41 +0000 (-0800)
Subject: SLUB: Deal with annoying gcc warning on kfree()
X-Git-Tag: v2.6.25-rc1~284^2~5
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5bb983b0cce9b7b281af15730f7019116dd42568;p=linux-2.6-omap-h63xx.git

SLUB: Deal with annoying gcc warning on kfree()

gcc 4.2 spits out an annoying warning if one casts a const void *
pointer to a void * pointer. No warning is generated if the
conversion is done through an assignment.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
---

diff --git a/mm/slub.c b/mm/slub.c
index 3f056677fa8..2dacaf519c4 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2601,6 +2601,7 @@ EXPORT_SYMBOL(ksize);
 void kfree(const void *x)
 {
 	struct page *page;
+	void *object = (void *)x;
 
 	if (unlikely(ZERO_OR_NULL_PTR(x)))
 		return;
@@ -2610,7 +2611,7 @@ void kfree(const void *x)
 		put_page(page);
 		return;
 	}
-	slab_free(page->slab, page, (void *)x, __builtin_return_address(0));
+	slab_free(page->slab, page, object, __builtin_return_address(0));
 }
 EXPORT_SYMBOL(kfree);