Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9defda18 authored by Tejun Heo's avatar Tejun Heo
Browse files

percpu: move accessors from include/linux/percpu.h to percpu-defs.h 



include/linux/percpu-defs.h is gonna host all accessors and operations
so that arch headers can make use of them too without worrying about
circular dependency through include/linux/percpu.h.

This patch moves the following accessors from include/linux/percpu.h
to include/linux/percpu-defs.h.

* get/put_cpu_var()
* get/put_cpu_ptr()
* per_cpu_ptr()

This is pure reorgniazation.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarChristoph Lameter <cl@linux.com>
parent 62fde541

include/linux/percpu-defs.h

+32 −0
Original line number Diff line number Diff line
@@ -252,5 +252,37 @@ 
/* keep until we have removed all uses of __this_cpu_ptr */

#define __this_cpu_ptr(ptr)	raw_cpu_ptr(ptr)



/*

 * Must be an lvalue. Since @var must be a simple identifier,

 * we force a syntax error here if it isn't.

 */

#define get_cpu_var(var) (*({				\

	preempt_disable();				\

	this_cpu_ptr(&var); }))



/*

 * The weird & is necessary because sparse considers (void)(var) to be

 * a direct dereference of percpu variable (var).

 */

#define put_cpu_var(var) do {				\

	(void)&(var);					\

	preempt_enable();				\

} while (0)



#define get_cpu_ptr(var) ({				\

	preempt_disable();				\

	this_cpu_ptr(var); })



#define put_cpu_ptr(var) do {				\

	(void)(var);					\

	preempt_enable();				\

} while (0)



#ifdef CONFIG_SMP

#define per_cpu_ptr(ptr, cpu)	SHIFT_PERCPU_PTR((ptr), per_cpu_offset((cpu)))

#else

#define per_cpu_ptr(ptr, cpu)	({ (void)(cpu); VERIFY_PERCPU_PTR((ptr)); })

#endif



#endif /* __ASSEMBLY__ */

#endif /* _LINUX_PERCPU_DEFS_H */

include/linux/percpu.h

+0 −37
Original line number Diff line number Diff line
@@ -23,32 +23,6 @@ 
	 PERCPU_MODULE_RESERVE)

#endif



/*

 * Must be an lvalue. Since @var must be a simple identifier,

 * we force a syntax error here if it isn't.

 */

#define get_cpu_var(var) (*({				\

	preempt_disable();				\

	this_cpu_ptr(&var); }))



/*

 * The weird & is necessary because sparse considers (void)(var) to be

 * a direct dereference of percpu variable (var).

 */

#define put_cpu_var(var) do {				\

	(void)&(var);					\

	preempt_enable();				\

} while (0)



#define get_cpu_ptr(var) ({				\

	preempt_disable();				\

	this_cpu_ptr(var); })



#define put_cpu_ptr(var) do {				\

	(void)(var);					\

	preempt_enable();				\

} while (0)



/* minimum unit size, also is the maximum supported allocation size */

#define PCPU_MIN_UNIT_SIZE		PFN_ALIGN(32 << 10)
@@ -140,17 +114,6 @@ extern int __init pcpu_page_first_chunk(size_t reserved_size, 
				pcpu_fc_populate_pte_fn_t populate_pte_fn);

#endif



/*

 * Use this to get to a cpu's version of the per-cpu object

 * dynamically allocated. Non-atomic access to the current CPU's

 * version should probably be combined with get_cpu()/put_cpu().

 */

#ifdef CONFIG_SMP

#define per_cpu_ptr(ptr, cpu)	SHIFT_PERCPU_PTR((ptr), per_cpu_offset((cpu)))

#else

#define per_cpu_ptr(ptr, cpu)	({ (void)(cpu); VERIFY_PERCPU_PTR((ptr)); })

#endif



extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align);

extern bool is_kernel_percpu_address(unsigned long addr);