diff --git a/[refs] b/[refs]
index 922c520d74a9..435d70011097 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f5c79f2920cbc21c718daeb0b12d69acf4de163
+refs/heads/master: 66341a905ef5b3e7aea65b5d9bd1b0361b0ccc61
diff --git a/trunk/include/linux/percpu.h b/trunk/include/linux/percpu.h
index 5451eb1e781d..fb8d2d24e4bb 100644
--- a/trunk/include/linux/percpu.h
+++ b/trunk/include/linux/percpu.h
@@ -38,7 +38,7 @@ extern void free_percpu(const void *);
 
 #else /* CONFIG_SMP */
 
-#define per_cpu_ptr(ptr, cpu) (ptr)
+#define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); (ptr); })
 
 static inline void *__alloc_percpu(size_t size, size_t align)
 {