arm64: barriers: wire up new barrier options
authorWill Deacon <will.deacon@arm.com>
Fri, 2 May 2014 15:24:11 +0000 (16:24 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 23 Oct 2014 18:47:06 +0000 (19:47 +0100)
commit3774b37a724bbdd3811f677b991d66b204328257
tree183562e2698159b96e5491e60ecc574639365384
parent2606d2448703e8995ca39a59d8a1106a1e0f034a
arm64: barriers: wire up new barrier options

Now that all callers of the barrier macros are updated to pass the
mandatory options, update the macros so the option is actually used.

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 493e68747e07b69da3d746352525a1ebd6b61d82)
Signed-off-by: Mark Brown <broonie@kernel.org>
Conflicts:
arch/arm64/include/asm/barrier.h
arch/arm64/include/asm/barrier.h