3 files changed, 20 insertions, 17 deletions

diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index aeeed806f991..bede380c07a9 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -191,7 +191,7 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)
         if (tsk != current)
                 fp = thread_saved_fp(tsk);
         else
-                asm("mov%? %0, fp" : "=r" (fp));
+                asm("mov %0, fp" : "=r" (fp) : : "cc");
 
         c_backtrace(fp, 0x10);
         barrier();
diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c
index 823e25d4547e..a1ae49df5c3b 100644
--- a/arch/arm/mach-footbridge/dc21285.c
+++ b/arch/arm/mach-footbridge/dc21285.c
@@ -69,16 +69,16 @@ dc21285_read_config(struct pci_bus *bus, unsigned int devfn, int where,
         if (addr)
                 switch (size) {
                 case 1:
-                        asm("ldr%?b     %0, [%1, %2]"
-                                : "=r" (v) : "r" (addr), "r" (where));
+                        asm("ldrb       %0, [%1, %2]"
+                                : "=r" (v) : "r" (addr), "r" (where) : "cc");
                         break;
                 case 2:
-                        asm("ldr%?h     %0, [%1, %2]"
-                                : "=r" (v) : "r" (addr), "r" (where));
+                        asm("ldrh       %0, [%1, %2]"
+                                : "=r" (v) : "r" (addr), "r" (where) : "cc");
                         break;
                 case 4:
-                        asm("ldr%?      %0, [%1, %2]"
-                                : "=r" (v) : "r" (addr), "r" (where));
+                        asm("ldr        %0, [%1, %2]"
+                                : "=r" (v) : "r" (addr), "r" (where) : "cc");
                         break;
                 }
 
@@ -103,16 +103,19 @@ dc21285_write_config(struct pci_bus *bus, unsigned int devfn, int where,
         if (addr)
                 switch (size) {
                 case 1:
-                        asm("str%?b     %0, [%1, %2]"
-                                : : "r" (value), "r" (addr), "r" (where));
+                        asm("strb       %0, [%1, %2]"
+                                : : "r" (value), "r" (addr), "r" (where)
+                                : "cc");
                         break;
                 case 2:
-                        asm("str%?h     %0, [%1, %2]"
-                                : : "r" (value), "r" (addr), "r" (where));
+                        asm("strh       %0, [%1, %2]"
+                                : : "r" (value), "r" (addr), "r" (where)
+                                : "cc");
                         break;
                 case 4:
-                        asm("str%?      %0, [%1, %2]"
-                                : : "r" (value), "r" (addr), "r" (where));
+                        asm("str        %0, [%1, %2]"
+                                : : "r" (value), "r" (addr), "r" (where)
+                                : "cc");
                         break;
                 }
 
diff --git a/arch/arm/vfp/vfpinstr.h b/arch/arm/vfp/vfpinstr.h
index 6c819aeae006..7f343a4beca0 100644
--- a/arch/arm/vfp/vfpinstr.h
+++ b/arch/arm/vfp/vfpinstr.h
@@ -73,14 +73,14 @@
 
 #define fmrx(_vfp_) ({                  \
         u32 __v;                        \
-        asm("mrc%? p10, 7, %0, " vfpreg(_vfp_) ", cr0, 0 @ fmrx %0, " #_vfp_    \
-            : "=r" (__v));              \
+        asm("mrc p10, 7, %0, " vfpreg(_vfp_) ", cr0, 0 @ fmrx   %0, " #_vfp_    \
+            : "=r" (__v) : : "cc");     \
         __v;                            \
  })
 
 #define fmxr(_vfp_,_var_)               \
-        asm("mcr%? p10, 7, %0, " vfpreg(_vfp_) ", cr0, 0 @ fmxr " #_vfp_ ", %0" \
-           : : "r" (_var_))
+        asm("mcr p10, 7, %0, " vfpreg(_vfp_) ", cr0, 0 @ fmxr   " #_vfp_ ", %0" \
+           : : "r" (_var_) : "cc")
 
 u32 vfp_single_cpdo(u32 inst, u32 fpscr);
 u32 vfp_single_cprt(u32 inst, u32 fpscr, struct pt_regs *regs);