diff options
| author |   Ralf Baechle <ralf@linux-mips.org> | 2010-08-03 03:42:32 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2010-08-05 13:25:40 +0100 |
| commit | 36f217d9df3e6bf8e6ae7647827b485b79dbaf8e (patch) | |
| tree | 0e80e87501c94a0bf1fa5973956fd2c5c174403f | |
| parent | MIPS: BCM47xx: Activate SSB_B43_PCI_BRIDGE by default (diff) | |
| download | linux-dev-36f217d9df3e6bf8e6ae7647827b485b79dbaf8e.tar.xz linux-dev-36f217d9df3e6bf8e6ae7647827b485b79dbaf8e.zip | |
MIPS: MTX1: Fix build.
CC arch/mips/alchemy/mtx-1/board_setup.o
{standard input}: Assembler messages:
{standard input}:263: Error: opcode not supported on this processor: mips1 (mips1) `sync'
{standard input}:274: Error: opcode not supported on this processor: mips1 (mips1) `sync'
{standard input}:296: Error: opcode not supported on this processor: mips1 (mips1) `sync'
[...]
Any .set mipsX statement other than .set mips0 at the end of inline
assembler is a big fat bug.
Introduced by 9482eabeca315c0276ffb50026b7482481b7097b (linux-mips.org) rsp.
32fd6901a6d8d19f94e4de6be4e4b552ab078620 (kernel.org).
While at it, fix the same issue in
arch/mips/alchemy/devboards/pb1000/board_setup.c
arch/mips/alchemy/xxs1500/board_setup.c
as well.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/alchemy/devboards/pb1000/board_setup.c | 5 | ||||
| -rw-r--r-- | arch/mips/alchemy/mtx-1/board_setup.c | 5 | ||||
| -rw-r--r-- | arch/mips/alchemy/xxs1500/board_setup.c | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/arch/mips/alchemy/devboards/pb1000/board_setup.c b/arch/mips/alchemy/devboards/pb1000/board_setup.c index 4ef50d86b181..46fdc8c9b99f 100644 --- a/arch/mips/alchemy/devboards/pb1000/board_setup.c +++ b/arch/mips/alchemy/devboards/pb1000/board_setup.c @@ -49,7 +49,10 @@ static void board_power_off(void) { printk(KERN_ALERT "It's now safe to remove power\n"); while (1) - asm volatile (".set mips3 ; wait ; .set mips1"); + asm volatile ( + " .set mips32 \n" + " wait \n" + " .set mips0 \n"); } void __init board_setup(void) diff --git a/arch/mips/alchemy/mtx-1/board_setup.c b/arch/mips/alchemy/mtx-1/board_setup.c index 52d883d37dd7..def1a75d7561 100644 --- a/arch/mips/alchemy/mtx-1/board_setup.c +++ b/arch/mips/alchemy/mtx-1/board_setup.c @@ -62,7 +62,10 @@ static void mtx1_power_off(void) { printk(KERN_ALERT "It's now safe to remove power\n"); while (1) - asm volatile (".set mips3 ; wait ; .set mips1"); + asm volatile ( + " .set mips32 \n" + " wait \n" + " .set mips0 \n"); } void __init board_setup(void) diff --git a/arch/mips/alchemy/xxs1500/board_setup.c b/arch/mips/alchemy/xxs1500/board_setup.c index 47b42927607b..7868aeab2453 100644 --- a/arch/mips/alchemy/xxs1500/board_setup.c +++ b/arch/mips/alchemy/xxs1500/board_setup.c @@ -44,7 +44,10 @@ static void xxs1500_power_off(void) { printk(KERN_ALERT "It's now safe to remove power\n"); while (1) - asm volatile (".set mips3 ; wait ; .set mips1"); + asm volatile ( + " .set mips32 \n" + " wait \n" + " .set mips0 \n"); } void __init board_setup(void) |