From 7c6e6f92339596cdaff695d7feb170efa0331242 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Sun, 13 Nov 2005 16:07:21 -0800
Subject: [PATCH] --- yaml --- r: 14071 b: refs/heads/master c:
 66341a905ef5b3e7aea65b5d9bd1b0361b0ccc61 h: refs/heads/master i:   14069:
 81b7de21eddbdfa92b8623aba36e56d8e44533bc   14067:
 7bc9a34955eddfadf75c1511810898437bb57d67   14063:
 8baa3eb9046c86975084ff040b23e52cba7c4aa9 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/percpu.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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)
 {