浏览代码

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>
Christoph Lameter 17 年之前
父节点
当前提交
5bb983b0cc
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      mm/slub.c

+ 2 - 1
mm/slub.c

@@ -2601,6 +2601,7 @@ EXPORT_SYMBOL(ksize);
 void kfree(const void *x)
 void kfree(const void *x)
 {
 {
 	struct page *page;
 	struct page *page;
+	void *object = (void *)x;
 
 
 	if (unlikely(ZERO_OR_NULL_PTR(x)))
 	if (unlikely(ZERO_OR_NULL_PTR(x)))
 		return;
 		return;
@@ -2610,7 +2611,7 @@ void kfree(const void *x)
 		put_page(page);
 		put_page(page);
 		return;
 		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);
 EXPORT_SYMBOL(kfree);