percpu: merge VERIFY_PERCPU_PTR() into its only user

Merge VERIFY_PERCPU_PTR() into non-CONFIG_SMP per_cpu_ptr() to make macro
similar to CONFIG_SMP per_cpu_ptr().  This will allow a follow-up patch to
refactor common code to a macro.

No functional changes, non-CONFIG_SMP per_cpu_ptr() was the only user of
VERIFY_PERCPU_PTR().

Link: https://lkml.kernel.org/r/20241021080856.48746-1-ubizjak@gmail.com
Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Acked-by: Christoph Lameter <cl@linux.com>
Cc: Dennis Zhou <dennis@kernel.org>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h
index 8efce7414fad690e6aa7fccef536f77f4a7f0e3c..7fa88c5f4b26c3a9ecf619f7b3c8fc9bc62c0434 100644 (file)
--- a/include/linux/percpu-defs.h
+++ b/include/linux/percpu-defs.h
@@ -254,13 +254,13 @@ do {                                                                      \
 
 #else  /* CONFIG_SMP */
 
-#define VERIFY_PERCPU_PTR(__p)                                         \
+#define per_cpu_ptr(ptr, cpu)                                          \
 ({                                                                     \
-       __verify_pcpu_ptr(__p);                                         \
-       (typeof(*(__p)) __kernel __force *)(__p);                       \
+       (void)(cpu);                                                    \
+       __verify_pcpu_ptr(ptr);                                         \
+       (typeof(*(ptr)) __kernel __force *)(ptr);                       \
 })
 
-#define per_cpu_ptr(ptr, cpu)  ({ (void)(cpu); VERIFY_PERCPU_PTR(ptr); })
 #define raw_cpu_ptr(ptr)       per_cpu_ptr(ptr, 0)
 #define this_cpu_ptr(ptr)      raw_cpu_ptr(ptr)