aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2012-09-10 17:28:03 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2012-09-14 14:52:59 +0100
commit5e09c24cd639a387a9a23ea2a475d7997f24fd5c (patch)
treeca016c77dcc87b7ab08b3d131f0a359bb691b5c4
parent319ad6ed02f670701a983d7cd48936562426f170 (diff)
downloadlinux-aarch64-5e09c24cd639a387a9a23ea2a475d7997f24fd5c.tar.gz
arm64: Remove unnecessary delay in machine_restart()
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Reported-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm64/kernel/process.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 0240c798292..635310ec444 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -173,9 +173,7 @@ void machine_restart(char *cmd)
/*
* Whoops - the architecture was unable to reboot.
- * Tell the user!
*/
- mdelay(1000);
printk("Reboot failed -- System halted\n");
while (1);
}