openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

MIPS: barrier: Remove fast_mb() Octeon #ifdef'ery 

The definition of fast_mb() is the same in both the Octeon & non-Octeon
cases, so remove the duplication & define it only once.

Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
Cc: Huacai Chen <chenhc@lemote.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: linux-kernel@vger.kernel.org
This commit is contained in:
Paul Burton 2019-10-01 21:53:11 +00:00
parent 05e6da742b
commit 5c12a6eff6
No known key found for this signature in database
GPG Key ID: 3EA79FACB57500DD
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/mips/include/asm/barrier.h
View File

@ -38,6 +38,8 @@ static inline void wmb(void)
} }
#define wmb wmb #define wmb wmb
#define fast_mb() __sync()
#define __fast_iob() \ #define __fast_iob() \
__asm__ __volatile__( \ __asm__ __volatile__( \
".set push\n\t" \ ".set push\n\t" \
@ -49,10 +51,8 @@ static inline void wmb(void)
: "m" (*(int *)CKSEG1) \ : "m" (*(int *)CKSEG1) \
: "memory") : "memory")
#ifdef CONFIG_CPU_CAVIUM_OCTEON #ifdef CONFIG_CPU_CAVIUM_OCTEON
# define fast_mb() __sync()
# define fast_iob() do { } while (0) # define fast_iob() do { } while (0)
#else /* ! CONFIG_CPU_CAVIUM_OCTEON */ #else /* ! CONFIG_CPU_CAVIUM_OCTEON */
# define fast_mb() __sync()
# ifdef CONFIG_SGI_IP28 # ifdef CONFIG_SGI_IP28
# define fast_iob() \ # define fast_iob() \
__asm__ __volatile__( \ __asm__ __volatile__( \