2 files changed, 28 insertions, 29 deletions

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 43c0acad7160..16c673096a22 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -95,6 +95,34 @@ config S390
         select HAVE_ARCH_TRACEHOOK
         select INIT_ALL_POSSIBLE
         select HAVE_PERF_EVENTS
+        select ARCH_INLINE_SPIN_TRYLOCK
+        select ARCH_INLINE_SPIN_TRYLOCK_BH
+        select ARCH_INLINE_SPIN_LOCK
+        select ARCH_INLINE_SPIN_LOCK_BH
+        select ARCH_INLINE_SPIN_LOCK_IRQ
+        select ARCH_INLINE_SPIN_LOCK_IRQSAVE
+        select ARCH_INLINE_SPIN_UNLOCK
+        select ARCH_INLINE_SPIN_UNLOCK_BH
+        select ARCH_INLINE_SPIN_UNLOCK_IRQ
+        select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE
+        select ARCH_INLINE_READ_TRYLOCK
+        select ARCH_INLINE_READ_LOCK
+        select ARCH_INLINE_READ_LOCK_BH
+        select ARCH_INLINE_READ_LOCK_IRQ
+        select ARCH_INLINE_READ_LOCK_IRQSAVE
+        select ARCH_INLINE_READ_UNLOCK
+        select ARCH_INLINE_READ_UNLOCK_BH
+        select ARCH_INLINE_READ_UNLOCK_IRQ
+        select ARCH_INLINE_READ_UNLOCK_IRQRESTORE
+        select ARCH_INLINE_WRITE_TRYLOCK
+        select ARCH_INLINE_WRITE_LOCK
+        select ARCH_INLINE_WRITE_LOCK_BH
+        select ARCH_INLINE_WRITE_LOCK_IRQ
+        select ARCH_INLINE_WRITE_LOCK_IRQSAVE
+        select ARCH_INLINE_WRITE_UNLOCK
+        select ARCH_INLINE_WRITE_UNLOCK_BH
+        select ARCH_INLINE_WRITE_UNLOCK_IRQ
+        select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
 
 config SCHED_OMIT_FRAME_POINTER
         bool
diff --git a/arch/s390/include/asm/spinlock.h b/arch/s390/include/asm/spinlock.h
index 41ce6861174e..c9af0d19c7ab 100644
--- a/arch/s390/include/asm/spinlock.h
+++ b/arch/s390/include/asm/spinlock.h
@@ -191,33 +191,4 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw)
 #define _raw_read_relax(lock)   cpu_relax()
 #define _raw_write_relax(lock)  cpu_relax()
 
-#define __always_inline__spin_lock
-#define __always_inline__read_lock
-#define __always_inline__write_lock
-#define __always_inline__spin_lock_bh
-#define __always_inline__read_lock_bh
-#define __always_inline__write_lock_bh
-#define __always_inline__spin_lock_irq
-#define __always_inline__read_lock_irq
-#define __always_inline__write_lock_irq
-#define __always_inline__spin_lock_irqsave
-#define __always_inline__read_lock_irqsave
-#define __always_inline__write_lock_irqsave
-#define __always_inline__spin_trylock
-#define __always_inline__read_trylock
-#define __always_inline__write_trylock
-#define __always_inline__spin_trylock_bh
-#define __always_inline__spin_unlock
-#define __always_inline__read_unlock
-#define __always_inline__write_unlock
-#define __always_inline__spin_unlock_bh
-#define __always_inline__read_unlock_bh
-#define __always_inline__write_unlock_bh
-#define __always_inline__spin_unlock_irq
-#define __always_inline__read_unlock_irq
-#define __always_inline__write_unlock_irq
-#define __always_inline__spin_unlock_irqrestore
-#define __always_inline__read_unlock_irqrestore
-#define __always_inline__write_unlock_irqrestore
-
 #endif /* __ASM_SPINLOCK_H */