diff options
Diffstat (limited to 'arch/mips/include/asm/io.h')
-rw-r--r-- | arch/mips/include/asm/io.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index b04e4de5dd2e..a58f22998a86 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h | |||
@@ -329,14 +329,10 @@ static inline void pfx##write##bwlq(type val, \ | |||
329 | "dsrl32 %L0, %L0, 0" "\n\t" \ | 329 | "dsrl32 %L0, %L0, 0" "\n\t" \ |
330 | "dsll32 %M0, %M0, 0" "\n\t" \ | 330 | "dsll32 %M0, %M0, 0" "\n\t" \ |
331 | "or %L0, %L0, %M0" "\n\t" \ | 331 | "or %L0, %L0, %M0" "\n\t" \ |
332 | ".set push" "\n\t" \ | ||
333 | ".set noreorder" "\n\t" \ | ||
334 | ".set nomacro" "\n\t" \ | ||
335 | "sd %L0, %2" "\n\t" \ | 332 | "sd %L0, %2" "\n\t" \ |
336 | ".set pop" "\n\t" \ | ||
337 | ".set mips0" "\n" \ | 333 | ".set mips0" "\n" \ |
338 | : "=r" (__tmp) \ | 334 | : "=r" (__tmp) \ |
339 | : "0" (__val), "R" (*__mem)); \ | 335 | : "0" (__val), "m" (*__mem)); \ |
340 | if (irq) \ | 336 | if (irq) \ |
341 | local_irq_restore(__flags); \ | 337 | local_irq_restore(__flags); \ |
342 | } else \ | 338 | } else \ |
@@ -359,16 +355,12 @@ static inline type pfx##read##bwlq(const volatile void __iomem *mem) \ | |||
359 | local_irq_save(__flags); \ | 355 | local_irq_save(__flags); \ |
360 | __asm__ __volatile__( \ | 356 | __asm__ __volatile__( \ |
361 | ".set mips3" "\t\t# __readq" "\n\t" \ | 357 | ".set mips3" "\t\t# __readq" "\n\t" \ |
362 | ".set push" "\n\t" \ | ||
363 | ".set noreorder" "\n\t" \ | ||
364 | ".set nomacro" "\n\t" \ | ||
365 | "ld %L0, %1" "\n\t" \ | 358 | "ld %L0, %1" "\n\t" \ |
366 | ".set pop" "\n\t" \ | ||
367 | "dsra32 %M0, %L0, 0" "\n\t" \ | 359 | "dsra32 %M0, %L0, 0" "\n\t" \ |
368 | "sll %L0, %L0, 0" "\n\t" \ | 360 | "sll %L0, %L0, 0" "\n\t" \ |
369 | ".set mips0" "\n" \ | 361 | ".set mips0" "\n" \ |
370 | : "=r" (__val) \ | 362 | : "=r" (__val) \ |
371 | : "R" (*__mem)); \ | 363 | : "m" (*__mem)); \ |
372 | if (irq) \ | 364 | if (irq) \ |
373 | local_irq_restore(__flags); \ | 365 | local_irq_restore(__flags); \ |
374 | } else { \ | 366 | } else { \ |