The patch titled
AVR32: Fix invalid constraints for stcond
has been removed from the -mm tree. Its filename is
avr32-fix-invalid-constraints-for-stcond.patch
This patch was dropped because it was folded into avr32-arch.patch
------------------------------------------------------
Subject: AVR32: Fix invalid constraints for stcond
From: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx>
Because gcc doesn't seem to like arch-dependent constraints in inline asm, we
ended up using "m" as constraint for the stcond instruction. This is wrong
since stcond doesn't support indexed addressing, but it did seem to work on
all the configurations we tried out.
When trying to build an allyesconfig, however, things broke in the ocfs2
filesystem as the compiler used indexed addressing for the stcond instruction
and the assembler panic'ed.
Using the vaguely documented "o" constraint seems to fix the problem. This
only allows "offsetable" memory operands, and since (reg + reg + constant) is
not possible with any AVR32 instruction, gcc is forced to disallow indexed
addressing.
Signed-off-by: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-avr32/atomic.h | 10 +++++-----
include/asm-avr32/bitops.h | 20 ++++++++++----------
2 files changed, 15 insertions(+), 15 deletions(-)
diff -puN include/asm-avr32/atomic.h~avr32-fix-invalid-constraints-for-stcond include/asm-avr32/atomic.h
--- a/include/asm-avr32/atomic.h~avr32-fix-invalid-constraints-for-stcond
+++ a/include/asm-avr32/atomic.h
@@ -40,7 +40,7 @@ static inline int atomic_sub_return(int
" sub %0, %3\n"
" stcond %1, %0\n"
" brne 1b"
- : "=&r"(result), "=m"(v->counter)
+ : "=&r"(result), "=o"(v->counter)
: "m"(v->counter), "ir"(i)
: "cc");
@@ -68,7 +68,7 @@ static inline int atomic_add_return(int
" add %0, %3\n"
" stcond %2, %0\n"
" brne 1b"
- : "=&r"(result), "=m"(v->counter)
+ : "=&r"(result), "=o"(v->counter)
: "m"(v->counter), "r"(i)
: "cc", "memory");
@@ -100,7 +100,7 @@ static inline int atomic_sub_unless(atom
" brne 1b\n"
" mov %1, 1\n"
"1:"
- : "=&r"(tmp), "=&r"(result), "=m"(v->counter)
+ : "=&r"(tmp), "=&r"(result), "=o"(v->counter)
: "m"(v->counter), "ir"(a), "ir"(u)
: "cc", "memory");
@@ -136,7 +136,7 @@ static inline int atomic_add_unless(atom
" brne 1b\n"
" mov %1, 1\n"
"1:"
- : "=&r"(tmp), "=&r"(result), "=m"(v->counter)
+ : "=&r"(tmp), "=&r"(result), "=o"(v->counter)
: "m"(v->counter), "r"(a), "ir"(u)
: "cc", "memory");
}
@@ -165,7 +165,7 @@ static inline int atomic_sub_if_positive
" stcond %1, %0\n"
" brne 1b\n"
"1:"
- : "=&r"(result), "=m"(v->counter)
+ : "=&r"(result), "=o"(v->counter)
: "m"(v->counter), "ir"(i)
: "cc", "memory");
diff -puN include/asm-avr32/bitops.h~avr32-fix-invalid-constraints-for-stcond include/asm-avr32/bitops.h
--- a/include/asm-avr32/bitops.h~avr32-fix-invalid-constraints-for-stcond
+++ a/include/asm-avr32/bitops.h
@@ -40,7 +40,7 @@ static inline void set_bit(int nr, volat
" sbr %0, %3\n"
" stcond %1, %0\n"
" brne 1b"
- : "=r"(tmp), "=m"(*p)
+ : "=r"(tmp), "=o"(*p)
: "m"(*p), "i"(nr)
: "cc");
} else {
@@ -51,7 +51,7 @@ static inline void set_bit(int nr, volat
" or %0, %3\n"
" stcond %1, %0\n"
" brne 1b"
- : "=r"(tmp), "=m"(*p)
+ : "=r"(tmp), "=o"(*p)
: "m"(*p), "r"(mask)
: "cc");
}
@@ -79,7 +79,7 @@ static inline void clear_bit(int nr, vol
" cbr %0, %3\n"
" stcond %1, %0\n"
" brne 1b"
- : "=r"(tmp), "=m"(*p)
+ : "=r"(tmp), "=o"(*p)
: "m"(*p), "i"(nr)
: "cc");
} else {
@@ -90,7 +90,7 @@ static inline void clear_bit(int nr, vol
" andn %0, %3\n"
" stcond %1, %0\n"
" brne 1b"
- : "=r"(tmp), "=m"(*p)
+ : "=r"(tmp), "=o"(*p)
: "m"(*p), "r"(mask)
: "cc");
}
@@ -117,7 +117,7 @@ static inline void change_bit(int nr, vo
" eor %0, %3\n"
" stcond %1, %0\n"
" brne 1b"
- : "=r"(tmp), "=m"(*p)
+ : "=r"(tmp), "=o"(*p)
: "m"(*p), "r"(mask)
: "cc");
}
@@ -144,7 +144,7 @@ static inline int test_and_set_bit(int n
" sbr %0, %4\n"
" stcond %1, %0\n"
" brne 1b"
- : "=r"(tmp), "=m"(*p), "=r"(old)
+ : "=r"(tmp), "=o"(*p), "=r"(old)
: "m"(*p), "i"(nr)
: "memory", "cc");
} else {
@@ -154,7 +154,7 @@ static inline int test_and_set_bit(int n
" or %0, %2, %4\n"
" stcond %1, %0\n"
" brne 1b"
- : "=r"(tmp), "=m"(*p), "=r"(old)
+ : "=r"(tmp), "=o"(*p), "=r"(old)
: "m"(*p), "r"(mask)
: "memory", "cc");
}
@@ -184,7 +184,7 @@ static inline int test_and_clear_bit(int
" cbr %0, %4\n"
" stcond %1, %0\n"
" brne 1b"
- : "=r"(tmp), "=m"(*p), "=r"(old)
+ : "=r"(tmp), "=o"(*p), "=r"(old)
: "m"(*p), "i"(nr)
: "memory", "cc");
} else {
@@ -195,7 +195,7 @@ static inline int test_and_clear_bit(int
" andn %0, %4\n"
" stcond %1, %0\n"
" brne 1b"
- : "=r"(tmp), "=m"(*p), "=r"(old)
+ : "=r"(tmp), "=o"(*p), "=r"(old)
: "m"(*p), "r"(mask)
: "memory", "cc");
}
@@ -223,7 +223,7 @@ static inline int test_and_change_bit(in
" eor %0, %2, %4\n"
" stcond %1, %0\n"
" brne 1b"
- : "=r"(tmp), "=m"(*p), "=r"(old)
+ : "=r"(tmp), "=o"(*p), "=r"(old)
: "m"(*p), "r"(mask)
: "memory", "cc");
_
Patches currently in -mm which might be from hskinnemoen@xxxxxxxxx are
origin.patch
avr32-arch.patch
avr32-fix-invalid-constraints-for-stcond.patch
avr32-add-support-for-irq-flags-state-tracing.patch
avr32-turn-off-support-for-discontigmem-and-sparsemem.patch
avr32-always-enable-config_embedded.patch
avr32-export-the-find__bit-functions.patch
avr32-add-defconfig-for-at32stk1002.patch
avr32-use-autoconf-instead-of-marker.patch
avr32-dont-assume-anything-about-max_nr_zones.patch
avr32-add-i-o-port-access-primitives.patch
avr32-use-linux-pfnh.patch
avr32-kill-config_discontigmem-support-completely.patch
avr32-fix-bug-in-__avr32_asr64.patch
avr32-switch-to-generic-timekeeping-framework.patch
avr32-set-kbuild_defconfig.patch
avr32-kprobes-compile-fix.patch
avr32-asm-ioh-should-include-asm-byteorderh.patch
avr32-fix-output-constraints-in-asm-bitopsh.patch
avr32-standardize-pxx_page-macros-fix.patch
avr32-rename-at32stk100x-atstk100x.patch
avr32-dont-leave-dbe-set-when-resetting-cpu.patch
avr32-make-prot_write-prot_exec-imply-prot_read.patch
avr32-remove-set_wmb.patch
avr32-use-parse_early_param.patch
avr32-fix-exported-headers.patch
avr32-fix-__const_udelay-overflow-bug.patch
remove-zone_dma-remains-from-avr32.patch
avr32-mtd-static-memory-controller-driver-try-2.patch
avr32-mtd-at49bv6416-platform-device-for-atstk1000.patch
directed-yield-cpu_relax-variants-for-spinlocks-and-rw-locks.patch
generic-ioremap_page_range-implementation.patch
generic-ioremap_page_range-implementation-fix.patch
generic-ioremap_page_range-implementation-nommu-fix.patch
generic-ioremap_page_range-flush_cache_vmap.patch
generic-ioremap_page_range-alpha-conversion.patch
generic-ioremap_page_range-avr32-conversion.patch
generic-ioremap_page_range-cris-conversion.patch
generic-ioremap_page_range-i386-conversion.patch
generic-ioremap_page_range-i386-conversion-fix.patch
generic-ioremap_page_range-m32r-conversion.patch
generic-ioremap_page_range-mips-conversion.patch
generic-ioremap_page_range-mips-conversion-fix.patch
generic-ioremap_page_range-parisc-conversion.patch
generic-ioremap_page_range-s390-conversion.patch
generic-ioremap_page_range-sh-conversion.patch
generic-ioremap_page_range-sh64-conversion.patch
generic-ioremap_page_range-x86_64-conversion.patch
generic-ioremap_page_range-x86_64-conversion-fix.patch
avr32-implement-kernel_execve.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
