diff options
| author | Maciej W. Rozycki <macro@linux-mips.org> | 2014-04-06 21:42:49 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-05-30 21:01:08 +0200 |
| commit | e496453d3e15ae3e153a03116cb6070e00ec63ee (patch) | |
| tree | 8668bb8bdeee94b9db32246eb7729bffd7301d8e | |
| parent | 06947aaaf9bf7da0b29e211ee1a44f3ca91c08fa (diff) | |
| download | blackbird-op-linux-e496453d3e15ae3e153a03116cb6070e00ec63ee.tar.gz blackbird-op-linux-e496453d3e15ae3e153a03116cb6070e00ec63ee.zip | |
MIPS: __delay ABI-dependent subtraction simplification
This small update to the previous fix to __delay removes a conditional
around the ABI-dependent subtraction operation within an inline asm in
favor to the standard <asm/asm.h> LONG_SUBU macro. No change in code
produced.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/6703/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/lib/delay.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/mips/lib/delay.c b/arch/mips/lib/delay.c index 705cfb7c1a74..21d27c6819a2 100644 --- a/arch/mips/lib/delay.c +++ b/arch/mips/lib/delay.c @@ -11,7 +11,9 @@ #include <linux/module.h> #include <linux/param.h> #include <linux/smp.h> +#include <linux/stringify.h> +#include <asm/asm.h> #include <asm/compiler.h> #include <asm/war.h> @@ -27,11 +29,7 @@ void __delay(unsigned long loops) " .set noreorder \n" " .align 3 \n" "1: bnez %0, 1b \n" -#if BITS_PER_LONG == 32 - " subu %0, %1 \n" -#else - " dsubu %0, %1 \n" -#endif + " " __stringify(LONG_SUBU) " %0, %1 \n" " .set reorder \n" : "=r" (loops) : GCC_DADDI_IMM_ASM() (1), "0" (loops)); |
