From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 14 Nov 2005 00:07:21 +0000 (-0800)
Subject: [PATCH] Shut up per_cpu_ptr() on UP
X-Git-Tag: v2.6.15-rc2~162
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66341a905ef5b3e7aea65b5d9bd1b0361b0ccc61;p=linux-2.6

[PATCH] Shut up per_cpu_ptr() on UP

Currently per_cpu_ptr() doesn't really do anything with 'cpu' in the UP
case.  This is problematic in the cases where this is the only place the
variable is referenced:

  CC      kernel/workqueue.o
  kernel/workqueue.c: In function `current_is_keventd':
  kernel/workqueue.c:460: warning: unused variable `cpu'

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index 5451eb1e78..fb8d2d24e4 100644
--- a/include/linux/percpu.h
+++ b/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)
 {