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

Commit 76ec51ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 

Pull percpu updates from Tejun Heo:
 "Minor cleanups"

* 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: clean up of schunk->map[] assignment in pcpu_setup_first_chunk
  percpu: update incorrect comment for this_cpu_*() operations
parents 7d3e2eb1 292c24a0

include/linux/percpu-defs.h

+2 −4
Original line number Diff line number Diff line
@@ -488,10 +488,8 @@ do { \ 
#define __this_cpu_dec_return(pcp)	__this_cpu_add_return(pcp, -1)



/*

 * Operations with implied preemption protection.  These operations can be

 * used without worrying about preemption.  Note that interrupts may still

 * occur while an operation is in progress and if the interrupt modifies

 * the variable too then RMW actions may not be reliable.

 * Operations with implied preemption/interrupt protection.  These

 * operations can be used without worrying about preemption or interrupt.

 */

#define this_cpu_read(pcp)		__pcpu_size_call_return(this_cpu_read_, pcp)

#define this_cpu_write(pcp, val)	__pcpu_size_call(this_cpu_write_, pcp, val)

mm/percpu.c

+2 −3
Original line number Diff line number Diff line
@@ -1668,9 +1668,8 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai, 
	schunk->map[1] = ai->static_size;

	schunk->map_used = 1;

	if (schunk->free_size)

		schunk->map[++schunk->map_used] = 1 | (ai->static_size + schunk->free_size);

	else

		schunk->map[1] |= 1;

		schunk->map[++schunk->map_used] = ai->static_size + schunk->free_size;

	schunk->map[schunk->map_used] |= 1;



	/* init dynamic chunk if necessary */

	if (dyn_size) {