hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

locking/atomics: Flip atomic_fetch_or() arguments 

All the atomic operations have their arguments the wrong way around;
make atomic_fetch_or() consistent and flip them.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Peter Zijlstra 2016-04-21 20:35:25 +02:00 committed by Ingo Molnar
parent b96bbdde19
commit a1cc5bcfcf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/atomic.h
View File

@ -560,11 +560,11 @@ static inline int atomic_dec_if_positive(atomic_t *v)
/** /**
* atomic_fetch_or - perform *p |= mask and return old value of *p * atomic_fetch_or - perform *p |= mask and return old value of *p
* @p: pointer to atomic_t
* @mask: mask to OR on the atomic_t * @mask: mask to OR on the atomic_t
* @p: pointer to atomic_t
*/ */
#ifndef atomic_fetch_or #ifndef atomic_fetch_or
static inline int atomic_fetch_or(atomic_t *p, int mask) static inline int atomic_fetch_or(int mask, atomic_t *p)
{ {
int old, val = atomic_read(p); int old, val = atomic_read(p);

4
kernel/time/tick-sched.c
View File

@ -262,7 +262,7 @@ static void tick_nohz_dep_set_all(atomic_t *dep,
{ {
int prev; int prev;
prev = atomic_fetch_or(dep, BIT(bit)); prev = atomic_fetch_or(BIT(bit), dep);
if (!prev) if (!prev)
tick_nohz_full_kick_all(); tick_nohz_full_kick_all();
} }
@ -292,7 +292,7 @@ void tick_nohz_dep_set_cpu(int cpu, enum tick_dep_bits bit)
ts = per_cpu_ptr(&tick_cpu_sched, cpu); ts = per_cpu_ptr(&tick_cpu_sched, cpu);
prev = atomic_fetch_or(&ts->tick_dep_mask, BIT(bit)); prev = atomic_fetch_or(BIT(bit), &ts->tick_dep_mask);
if (!prev) { if (!prev) {
preempt_disable(); preempt_disable();
/* Perf needs local kick that is NMI safe */ /* Perf needs local kick that is NMI safe */