Skip to content

Commit

Permalink
MIPS: ralink: Remove ralink_halt()
Browse files Browse the repository at this point in the history
ralink_halt() does nothing that machine_halt() doesn't already do, so it
adds no value.

It actually causes incorrect behaviour due to the "unreachable()" at the
end. This tells the compiler that the end of the function will never be
reached, which isn't true. The compiler responds by not adding a
'return' instruction, so control simply moves on to whatever bytes come
afterwards in memory. In my tested, that was the ralink_restart()
function. This means that an attempt to 'halt' the machine would
actually cause a reboot.

So remove ralink_halt() so that a 'halt' really does halt.

Fixes: c06e836 ("MIPS: ralink: adds reset code")
Signed-off-by: NeilBrown <neil@brown.name>
Cc: John Crispin <john@phrozen.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: <stable@vger.kernel.org> # 3.9+
Patchwork: https://patchwork.linux-mips.org/patch/18851/
Signed-off-by: James Hogan <jhogan@kernel.org>
  • Loading branch information
NeilBrown authored and James Hogan committed Mar 21, 2018
1 parent a821328 commit 891731f
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions arch/mips/ralink/reset.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,9 @@ static void ralink_restart(char *command)
unreachable();
}

static void ralink_halt(void)
{
local_irq_disable();
unreachable();
}

static int __init mips_reboot_setup(void)
{
_machine_restart = ralink_restart;
_machine_halt = ralink_halt;

return 0;
}
Expand Down

0 comments on commit 891731f

Please sign in to comment.