(void)__vpp_verify;                                             \
 } while (0)
 
+#define PERCPU_PTR(__p)                                                        \
+       (typeof(*(__p)) __force __kernel *)(__p);
+
 #ifdef CONFIG_SMP
 
 /*
- * Add an offset to a pointer but keep the pointer as-is.  Use RELOC_HIDE()
- * to prevent the compiler from making incorrect assumptions about the
- * pointer value.  The weird cast keeps both GCC and sparse happy.
+ * Add an offset to a pointer.  Use RELOC_HIDE() to prevent the compiler
+ * from making incorrect assumptions about the pointer value.
  */
 #define SHIFT_PERCPU_PTR(__p, __offset)                                        \
-       RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset))
+       RELOC_HIDE(PERCPU_PTR(__p), (__offset))
 
 #define per_cpu_ptr(ptr, cpu)                                          \
 ({                                                                     \
 ({                                                                     \
        (void)(cpu);                                                    \
        __verify_pcpu_ptr(ptr);                                         \
-       (typeof(*(ptr)) __kernel __force *)(ptr);                       \
+       PERCPU_PTR(ptr);                                                \
 })
 
 #define raw_cpu_ptr(ptr)       per_cpu_ptr(ptr, 0)