summaryrefslogtreecommitdiff
path: root/include/linux/percpu.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-09-10 01:38:43 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-09-10 01:38:43 +0400
commitde9ea203d105f760e8e995c07aa80e855a9aedba (patch)
tree75e4702e98a0b3ea9ed6d085f74474a70642909b /include/linux/percpu.h
parent2be23c475af8ae4e25f8bab08d815b17593bd547 (diff)
parentd56557af19867edb8c0e96f8e26399698a08857f (diff)
downloadlinux-de9ea203d105f760e8e995c07aa80e855a9aedba.tar.xz
Merge branch 'origin'
Diffstat (limited to 'include/linux/percpu.h')
-rw-r--r--include/linux/percpu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index b8b9084527b1..49466b13c5c6 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -149,7 +149,7 @@ extern void __init percpu_init_late(void);
#else /* CONFIG_SMP */
-#define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); (ptr); })
+#define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); VERIFY_PERCPU_PTR((ptr)); })
/* can't distinguish from other static vars, always false */
static inline bool is_kernel_percpu_address(unsigned long addr)