Gitweb:     http://git.kernel.org/linus/b560177f3e1c6b2d75b220d41ae72636243475c4
Commit:     b560177f3e1c6b2d75b220d41ae72636243475c4
Parent:     1aac4effad4ea52da94eb13b12e0ca1731407ee4
Author:     Geert Uytterhoeven <geert@linux-m68k.org>
AuthorDate: Sun Mar 21 10:52:21 2010 +0100
Committer:  Geert Uytterhoeven <geert@linux-m68k.org>
CommitDate: Wed Apr 14 19:45:37 2010 +0200

    m68k: Fix asm constraints for atomic_sub_and_test() and atomic_add_negative()
    
    Recently, we started seeing this on allmodconfig builds:
    
      CC      mm/memcontrol.o
    {standard input}: Assembler messages:
    {standard input}:4076: Error: operands mismatch -- statement `subl 12(%fp),170(%a0)' ignored
    
    Correct the asm constraint, like done for m68knommu.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 arch/m68k/include/asm/atomic_mm.h |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/m68k/include/asm/atomic_mm.h b/arch/m68k/include/asm/atomic_mm.h
index 88b7af2..d9d2ed6 100644
--- a/arch/m68k/include/asm/atomic_mm.h
+++ b/arch/m68k/include/asm/atomic_mm.h
@@ -148,14 +148,18 @@ static inline int atomic_xchg(atomic_t *v, int new)
 static inline int atomic_sub_and_test(int i, atomic_t *v)
 {
 	char c;
-	__asm__ __volatile__("subl %2,%1; seq %0" : "=d" (c), "+m" (*v): "g" (i));
+	__asm__ __volatile__("subl %2,%1; seq %0"
+			     : "=d" (c), "+m" (*v)
+			     : "id" (i));
 	return c != 0;
 }
 
 static inline int atomic_add_negative(int i, atomic_t *v)
 {
 	char c;
-	__asm__ __volatile__("addl %2,%1; smi %0" : "=d" (c), "+m" (*v): "g" (i));
+	__asm__ __volatile__("addl %2,%1; smi %0"
+			     : "=d" (c), "+m" (*v)
+			     : "id" (i));
 	return c != 0;
 }
 
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html