From cecc5bb60bafe50fa4b5a8e43c2e5b995e23e737 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Tue, 29 May 2012 06:54:32 +0200 Subject: [PATCH] --- yaml --- r: 309597 b: refs/heads/master c: 0c44ca71f59447a5e602c45728829d1cb6a1b4b5 h: refs/heads/master i: 309595: c0212d63d79a82a51744252190f80592dba9f607 v: v3 --- [refs] | 2 +- trunk/arch/s390/include/asm/cmpxchg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 64a5881b26da..1b9304dad469 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9e3f776c811cc0647c7360844714b6a9b5fd0ef +refs/heads/master: 0c44ca71f59447a5e602c45728829d1cb6a1b4b5 diff --git a/trunk/arch/s390/include/asm/cmpxchg.h b/trunk/arch/s390/include/asm/cmpxchg.h index 81d7908416cf..ebd31481f1d2 100644 --- a/trunk/arch/s390/include/asm/cmpxchg.h +++ b/trunk/arch/s390/include/asm/cmpxchg.h @@ -181,7 +181,7 @@ static inline unsigned long long __cmpxchg64(void *ptr, " cds %0,%2,%1" : "+&d" (rp_old), "=Q" (ptr) : "d" (rp_new), "Q" (ptr) - : "cc"); + : "memory", "cc"); return rp_old.pair; } #define cmpxchg64(ptr, o, n) \