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

Commit 0a135ba1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: add __percpu sparse annotations to what's left
  percpu: add __percpu sparse annotations to fs
  percpu: add __percpu sparse annotations to core kernel subsystems
  local_t: Remove leftover local.h
  this_cpu: Remove pageset_notifier
  this_cpu: Page allocator conversion
  percpu, x86: Generic inc / dec percpu instructions
  local_t: Move local.h include to ringbuffer.c and ring_buffer_benchmark.c
  module: Use this_cpu_xx to dynamically allocate counters
  local_t: Remove cpu_local_xx macros
  percpu: refactor the code in pcpu_[de]populate_chunk()
  percpu: remove compile warnings caused by __verify_pcpu_ptr()
  percpu: make accessors check for percpu pointer in sparse
  percpu: add __percpu for sparse.
  percpu: make access macros universal
  percpu: remove per_cpu__ prefix.
parents 4850f524 a29d8b8e

arch/alpha/include/asm/local.h

+0 −17
Original line number Diff line number Diff line
@@ -98,21 +98,4 @@ static __inline__ long local_sub_return(long i, local_t * l) 
#define __local_add(i,l)	((l)->a.counter+=(i))

#define __local_sub(i,l)	((l)->a.counter-=(i))



/* Use these for per-cpu local_t variables: on some archs they are

 * much more efficient than these naive implementations.  Note they take

 * a variable, not an address.

 */

#define cpu_local_read(l)	local_read(&__get_cpu_var(l))

#define cpu_local_set(l, i)	local_set(&__get_cpu_var(l), (i))



#define cpu_local_inc(l)	local_inc(&__get_cpu_var(l))

#define cpu_local_dec(l)	local_dec(&__get_cpu_var(l))

#define cpu_local_add(i, l)	local_add((i), &__get_cpu_var(l))

#define cpu_local_sub(i, l)	local_sub((i), &__get_cpu_var(l))



#define __cpu_local_inc(l)	__local_inc(&__get_cpu_var(l))

#define __cpu_local_dec(l)	__local_dec(&__get_cpu_var(l))

#define __cpu_local_add(i, l)	__local_add((i), &__get_cpu_var(l))

#define __cpu_local_sub(i, l)	__local_sub((i), &__get_cpu_var(l))



#endif /* _ALPHA_LOCAL_H */

arch/blackfin/mach-common/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -816,8 +816,8 @@ ENDPROC(_resume) 


ENTRY(_ret_from_exception)

#ifdef CONFIG_IPIPE

	p2.l = _per_cpu__ipipe_percpu_domain;

	p2.h = _per_cpu__ipipe_percpu_domain;

	p2.l = _ipipe_percpu_domain;

	p2.h = _ipipe_percpu_domain;

	r0.l = _ipipe_root;

	r0.h = _ipipe_root;

	r2 = [p2];

arch/cris/arch-v10/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ mmu_bus_fault: 
1:	btstq	12, $r1		   ; Refill?

	bpl	2f

	lsrq	24, $r1     ; Get PGD index (bit 24-31)

	move.d  [per_cpu__current_pgd], $r0 ; PGD for the current process

	move.d  [current_pgd], $r0 ; PGD for the current process

	move.d	[$r0+$r1.d], $r0   ; Get PMD

	beq	2f

	nop

arch/cris/arch-v32/mm/mmu.S

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ 
#ifdef CONFIG_SMP

	move    $s7, $acr	; PGD

#else

	move.d  per_cpu__current_pgd, $acr ; PGD

	move.d  current_pgd, $acr ; PGD

#endif

	; Look up PMD in PGD

	lsrq	24, $r0	; Get PMD index into PGD (bit 24-31)

arch/ia64/include/asm/percpu.h

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#define PERCPU_ENOUGH_ROOM PERCPU_PAGE_SIZE



#ifdef __ASSEMBLY__

# define THIS_CPU(var)	(per_cpu__##var)  /* use this to mark accesses to per-CPU variables... */

# define THIS_CPU(var)	(var)  /* use this to mark accesses to per-CPU variables... */

#else /* !__ASSEMBLY__ */
@@ -39,7 +39,7 @@ extern void *per_cpu_init(void); 
 * On the positive side, using __ia64_per_cpu_var() instead of __get_cpu_var() is slightly

 * more efficient.

 */

#define __ia64_per_cpu_var(var)	per_cpu__##var

#define __ia64_per_cpu_var(var)	var



#include <asm-generic/percpu.h>