From: Namhyung Kim <namhyung@gmail.com>
Date: Fri, 6 Aug 2010 18:26:24 +0000 (+0900)
Subject: percpu: add __percpu notations to UP allocator
X-Git-Tag: v2.6.36-rc4~85^2~2
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=94cb121c9483f1ec9b1ef0c249fbfc49c628fa6b;p=net-next-2.6.git

percpu: add __percpu notations to UP allocator

Add __percpu notations to UP percpu allocator.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
---

diff --git a/mm/percpu_up.c b/mm/percpu_up.c
index c4351c7f57d..db884fae572 100644
--- a/mm/percpu_up.c
+++ b/mm/percpu_up.c
@@ -14,13 +14,13 @@ void __percpu *__alloc_percpu(size_t size, size_t align)
 	 * percpu sections on SMP for which this path isn't used.
 	 */
 	WARN_ON_ONCE(align > SMP_CACHE_BYTES);
-	return kzalloc(size, GFP_KERNEL);
+	return (void __percpu __force *)kzalloc(size, GFP_KERNEL);
 }
 EXPORT_SYMBOL_GPL(__alloc_percpu);
 
 void free_percpu(void __percpu *p)
 {
-	kfree(p);
+	kfree(this_cpu_ptr(p));
 }
 EXPORT_SYMBOL_GPL(free_percpu);