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.24.3~11
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=227db665f6f946d376d48785b08d2b0cd1f21aad;p=unionfs-2.6.39.y.git

SLUB: Deal with annoying gcc warning on kfree()

patch 5bb983b0cce9b7b281af15730f7019116dd42568 in mainline.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/mm/slub.c b/mm/slub.c
index 474945ecd89..c432f680675 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2592,6 +2592,7 @@ EXPORT_SYMBOL(ksize);
 void kfree(const void *x)
 {
 	struct page *page;
+	void *object = (void *)x;
 
 	if (unlikely(ZERO_OR_NULL_PTR(x)))
 		return;
@@ -2601,7 +2602,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);