From 2664610c2e53144adc9d99340f3d0c943ed57a73 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Wed, 31 Jan 2018 15:37:55 +0000 Subject: [PATCH 006/104] Revert "s390/spinlock: add gmb memory barrier" CVE-2017-5753 (revert embargoed) CVE-2017-5715 (revert embargoed) This reverts commit 74d11fe3e7d95384d51521d312a262cfcf81f791. Signed-off-by: Andy Whitcroft --- arch/s390/include/asm/barrier.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h index 08fbfef6469f..5c8db3ce61c8 100644 --- a/arch/s390/include/asm/barrier.h +++ b/arch/s390/include/asm/barrier.h @@ -7,8 +7,6 @@ #ifndef __ASM_BARRIER_H #define __ASM_BARRIER_H -#include - /* * Force strict CPU ordering. * And yes, this is required on UP too when we're talking @@ -24,14 +22,6 @@ #define mb() do { asm volatile(__ASM_BARRIER : : : "memory"); } while (0) -static inline void gmb(void) -{ - asm volatile( - ALTERNATIVE("", ".long 0xb2e8f000", 81) - : : : "memory"); -} -#define gmb gmb - #define rmb() barrier() #define wmb() barrier() #define dma_rmb() mb() -- 2.15.1