diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-06 15:22:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-06 15:22:01 -0700 |
| commit | 3b69e8b4571125bec1f77f886174fe6cab6b9d75 (patch) | |
| tree | 4a125694310d161b6cb3097c4bf7542e97919987 /tools/arch | |
| parent | b170290c2836c40ab565736ba37681eb3dfd79b8 (diff) | |
| parent | 37744feebc086908fd89760650f458ab19071750 (diff) | |
| download | linux-3b69e8b4571125bec1f77f886174fe6cab6b9d75.tar.gz linux-3b69e8b4571125bec1f77f886174fe6cab6b9d75.tar.bz2 linux-3b69e8b4571125bec1f77f886174fe6cab6b9d75.zip | |
Merge tag 'sh-for-5.8' of git://git.libc.org/linux-sh
Pull arch/sh updates from Rich Felker:
"Fix for arch/sh build regression with newer binutils, removal of SH5,
fixes for module exports, and misc cleanup"
* tag 'sh-for-5.8' of git://git.libc.org/linux-sh:
sh: remove sh5 support
sh: add missing EXPORT_SYMBOL() for __delay
sh: Convert ins[bwl]/outs[bwl] macros to inline functions
sh: Convert iounmap() macros to inline functions
sh: Add missing DECLARE_EXPORT() for __ashiftrt_r4_xx
sh: configs: Cleanup old Kconfig IO scheduler options
arch/sh: vmlinux.scr
sh: Replace CONFIG_MTD_M25P80 with CONFIG_MTD_SPI_NOR in sh7757lcr_defconfig
sh: sh4a: Bring back tmu3_device early device
Diffstat (limited to 'tools/arch')
| -rw-r--r-- | tools/arch/sh/include/asm/barrier.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/arch/sh/include/asm/barrier.h b/tools/arch/sh/include/asm/barrier.h index bde5221af282..7eaea27cdd67 100644 --- a/tools/arch/sh/include/asm/barrier.h +++ b/tools/arch/sh/include/asm/barrier.h @@ -22,7 +22,7 @@ * Historically we have only done this type of barrier for the MMUCR, but * it's also necessary for the CCR, so we make it generic here instead. */ -#if defined(__SH4A__) || defined(__SH5__) +#if defined(__SH4A__) #define mb() __asm__ __volatile__ ("synco": : :"memory") #define rmb() mb() #define wmb() mb() |