summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/proc-armv/system.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
commitd6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch)
treee2be02f33984c48ec019c654051d27964e42c441 /include/asm-arm/proc-armv/system.h
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'include/asm-arm/proc-armv/system.h')
-rw-r--r--include/asm-arm/proc-armv/system.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/proc-armv/system.h b/include/asm-arm/proc-armv/system.h
index 2aa59a26e..20250f659 100644
--- a/include/asm-arm/proc-armv/system.h
+++ b/include/asm-arm/proc-armv/system.h
@@ -116,7 +116,7 @@ extern unsigned long cr_alignment; /* defined in entry-armv.S */
" bic %0, %0, #192\n" \
" orr %0, %0, %1\n" \
" msr cpsr, %0" \
- : "=r" (temp) \
+ : "=&r" (temp) \
: "r" (x) \
: "memory"); \
} while (0)