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

Commit 7c5491b8 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS: pm-cps: convert smp_mb__*() 



Commit 91bbefe6 "arch,mips: Convert smp_mb__*()" replaced the
smp_mb__* functions with a simpler API, whilst commit 3179d37e
"MIPS: pm-cps: add PM state entry code for CPS systems" introduced
new uses of smp_mb__before_atomic_inc & smp_mb__after_clear_bit.
Replace those calls with the corresponding before & after atomic
functions of the new, simpler API in order to avoid a build failure:

  arch/mips/kernel/pm-cps.c: In function 'coupled_barrier':
  arch/mips/kernel/pm-cps.c:104:2: error: 'smp_mb__before_atomic_inc' is
    deprecated (declared at include/linux/atomic.h:11)
    [-Werror=deprecated-declarations]

  arch/mips/kernel/pm-cps.c: In function 'cps_pm_enter_state':
  arch/mips/kernel/pm-cps.c:161:2: error: 'smp_mb__after_clear_bit' is
    deprecated (declared at include/linux/bitops.h:48)
    [-Werror=deprecated-declarations]

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Reviewed-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7086/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent e114ba20

arch/mips/kernel/pm-cps.c

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static void coupled_barrier(atomic_t *a, unsigned online) 
	if (!coupled_coherence)

		return;



	smp_mb__before_atomic_inc();

	smp_mb__before_atomic();

	atomic_inc(a);



	while (atomic_read(a) < online)
@@ -158,7 +158,7 @@ int cps_pm_enter_state(enum cps_pm_state state) 


	/* Indicate that this CPU might not be coherent */

	cpumask_clear_cpu(cpu, &cpu_coherent_mask);

	smp_mb__after_clear_bit();

	smp_mb__after_atomic();



	/* Create a non-coherent mapping of the core ready_count */

	core_ready_count = per_cpu(ready_count, core);