Commit 74ef070e authored by Uros Bizjak's avatar Uros Bizjak Committed by Andrew Morton
Browse files

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: default avatarUros Bizjak <ubizjak@gmail.com>
Acked-by: default avatarChristoph Lameter <cl@linux.com>
Cc: Dennis Zhou <dennis@kernel.org>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 8f0d91f4

include/linux/percpu-defs.h

+4 −4
Original line number Diff line number Diff line
@@ -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)