Commit b5e792f1 authored Feb 28, 2018 by Linus Torvalds

Merge tag 'riscv-for-linus-4.16-rc4_smp_mb' of...

Merge tag 'riscv-for-linus-4.16-rc4_smp_mb' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux

Pull RISC-V fix from Palmer Dabbelt:
 "This week we have a single fix: replacing smp_mb() with __smp_mb().

  We were the only architecture with smp_mb() and it appears to just be
  clearly wrong, so I think this is a pretty safe patch for an RC"

* tag 'riscv-for-linus-4.16-rc4_smp_mb' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux:
  riscv/barrier: Define __smp_{mb,rmb,wmb}

parents 3499de32 ab4af605

arch/riscv/include/asm/barrier.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -34,9 +34,9 @@
		#define wmb() RISCV_FENCE(ow,ow)

		/* These barriers do not need to enforce ordering on devices, just memory. */
		#define smp_mb() RISCV_FENCE(rw,rw)
		#define smp_rmb() RISCV_FENCE(r,r)
		#define smp_wmb() RISCV_FENCE(w,w)
		#define __smp_mb() RISCV_FENCE(rw,rw)
		#define __smp_rmb() RISCV_FENCE(r,r)
		#define __smp_wmb() RISCV_FENCE(w,w)

		/*
		* This is a very specific barrier: it's currently only used in two places in

Admin message