diff --git a/[refs] b/[refs]
index c182141f7d91..42501afd1159 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f04ba859597412afbfb31f2fcbe289f2461f9a1
+refs/heads/master: 64ef291f46d795917f32a0f5975e2b76f6fe206a
diff --git a/trunk/include/linux/percpu.h b/trunk/include/linux/percpu.h
index 3d9ba92b104f..519d6876590f 100644
--- a/trunk/include/linux/percpu.h
+++ b/trunk/include/linux/percpu.h
@@ -164,8 +164,8 @@ static inline void *pcpu_lpage_remapped(void *kaddr)
 
 #endif /* CONFIG_SMP */
 
-#define alloc_percpu(type)	(type *)__alloc_percpu(sizeof(type), \
-						       __alignof__(type))
+#define alloc_percpu(type)	\
+	(typeof(type) *)__alloc_percpu(sizeof(type), __alignof__(type))
 
 /*
  * Optional methods for optimized non-lvalue per-cpu variable access.