arm64: barriers: use barrier() instead of smp_mb() when !SMP
authorWill Deacon <will.deacon@arm.com>
Fri, 2 May 2014 15:24:12 +0000 (16:24 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 23 Oct 2014 18:47:55 +0000 (19:47 +0100)
commitb817da4cf03a33c8c40e3bef04d3f3ed64277d47
treed6b6972db11515d5e533bdff229c8f5f7dc8ca06
parent3774b37a724bbdd3811f677b991d66b204328257
arm64: barriers: use barrier() instead of smp_mb() when !SMP

The recently introduced acquire/release accessors refer to smp_mb()
in the !CONFIG_SMP case. This is confusing when reading the code, so use
barrier() directly when we know we're UP.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit be6209a6107e0f63544e3e7d00fd5c95434ec80a)
Signed-off-by: Mark Brown <broonie@kernel.org>
Conflicts:
arch/arm64/include/asm/barrier.h
arch/arm64/include/asm/barrier.h