summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2008-02-08 02:47:41 +0100
committerChristoph Lameter <christoph@stapp.engr.sgi.com>2008-02-08 02:47:41 +0100
commit5bb983b0cce9b7b281af15730f7019116dd42568 (patch)
tree858d23397eaffb7023e50918bc0a9f785b79c962 /mm
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
downloadlinux-5bb983b0cce9b7b281af15730f7019116dd42568.tar.xz
linux-5bb983b0cce9b7b281af15730f7019116dd42568.zip
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>
Diffstat (limited to 'mm')
-rw-r--r--mm/slub.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 3f056677fa8f..2dacaf519c4d 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);