summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2005-11-08 23:43:05 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-11-08 23:43:05 +0100
commitf8c905d368c757e2c96db293a472a31abcf4b147 (patch)
treeff762892db823ec597eba3cd895575c4d09d7762 /arch/arm/boot
parent[ARM] 3124/1: Sharp SL-6000x: SharpSL PCMCIA Updates (diff)
downloadlinux-f8c905d368c757e2c96db293a472a31abcf4b147.tar.xz
linux-f8c905d368c757e2c96db293a472a31abcf4b147.zip
[ARM] 3132/1: S3C2410 - reset on decompression error
Patch from Ben Dooks Force a watchdog reset if the system fails to decompress properly. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/compressed/misc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index 50f13eec6cd7..5ab94584baee 100644
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -283,8 +283,14 @@ void flush_window(void)
putstr(".");
}
+#ifndef arch_error
+#define arch_error(x)
+#endif
+
static void error(char *x)
{
+ arch_error(x);
+
putstr("\n\n");
putstr(x);
putstr("\n\n -- System halted");