Commit-ID: cb454fe10400566214ec690318a0167ff7f5b8ca Gitweb: http://git.kernel.org/tip/cb454fe10400566214ec690318a0167ff7f5b8ca Author: Joe Millenbach <jmillenbach@xxxxxxxxx> AuthorDate: Thu, 19 Jul 2012 18:04:38 -0700 Committer: H. Peter Anvin <hpa@xxxxxxxxx> CommitDate: Sat, 21 Jul 2012 11:07:22 -0700 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 <jmillenbach@xxxxxxxxx> Link: http://lkml.kernel.org/r/1342746282-28497-4-git-send-email-jmillenbach@xxxxxxxxx Signed-off-by: Gokul Caushik <caushik1@xxxxxxxxx> Reviewed-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx> Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx> --- arch/x86/boot/compressed/misc.c | 6 +++--- arch/x86/boot/compressed/misc.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index 49c6d56..de1d54d 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 3f19c81..4c1bfb6 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 */ -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html