aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2008-02-07 20:47:41 -0500
committerChristoph Lameter <christoph@stapp.engr.sgi.com>2008-02-07 20:47:41 -0500
commit5bb983b0cce9b7b281af15730f7019116dd42568 (patch)
tree858d23397eaffb7023e50918bc0a9f785b79c962 /mm
parent0afc2edfada50980bec999f94dcea26ebad3dda6 (diff)
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);
2601void kfree(const void *x) 2601void kfree(const void *x)
2602{ 2602{
2603 struct page *page; 2603 struct page *page;
2604 void *object = (void *)x;
2604 2605
2605 if (unlikely(ZERO_OR_NULL_PTR(x))) 2606 if (unlikely(ZERO_OR_NULL_PTR(x)))
2606 return; 2607 return;
@@ -2610,7 +2611,7 @@ void kfree(const void *x)
2610 put_page(page); 2611 put_page(page);
2611 return; 2612 return;
2612 } 2613 }
2613 slab_free(page->slab, page, (void *)x, __builtin_return_address(0)); 2614 slab_free(page->slab, page, object, __builtin_return_address(0));
2614} 2615}
2615EXPORT_SYMBOL(kfree); 2616EXPORT_SYMBOL(kfree);
2616 2617