diff --git a/[refs] b/[refs]
index ddf9b379671a..b33255a57923 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18cb2aef91b37dbce2bec2f39bb1dddd0e9dd838
+refs/heads/master: 94cb121c9483f1ec9b1ef0c249fbfc49c628fa6b
diff --git a/trunk/mm/percpu_up.c b/trunk/mm/percpu_up.c
index c4351c7f57d2..db884fae5721 100644
--- a/trunk/mm/percpu_up.c
+++ b/trunk/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);