From: Joe Millenbach Date: Fri, 20 Jul 2012 01:04:38 +0000 (-0700) Subject: x86, boot: Changed error putstr path to match new debug_putstr format X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cb454fe10400566214ec690318a0167ff7f5b8ca;p=linux-beck.git x86, boot: Changed error putstr path to match new debug_putstr format For consistency we changed the error output path to match the new debug path. Signed-off-by: Joe Millenbach Link: http://lkml.kernel.org/r/1342746282-28497-4-git-send-email-jmillenbach@gmail.com Signed-off-by: Gokul Caushik Reviewed-by: Josh Triplett Signed-off-by: H. Peter Anvin --- diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index 49c6d5632ef7..de1d54d8bddc 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c @@ -270,9 +270,9 @@ void *memcpy(void *dest, const void *src, size_t n) static void error(char *x) { - __putstr(1, "\n\n"); - __putstr(1, x); - __putstr(1, "\n\n -- System halted"); + error_putstr("\n\n"); + error_putstr(x); + error_putstr("\n\n -- System halted"); while (1) asm("hlt"); diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index 3f19c81a6203..4c1bfb69e0d8 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -26,6 +26,7 @@ extern struct boot_params *real_mode; /* Pointer to real-mode data */ void __putstr(int error, const char *s); #define putstr(__x) __putstr(0, __x) +#define error_putstr(__x) __putstr(1, __x) #define puts(__x) __putstr(0, __x) /* cmdline.c */