aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Millenbach <jmillenbach@gmail.com>2012-07-19 18:04:38 -0700
committerH. Peter Anvin <hpa@zytor.com>2012-07-21 11:07:22 -0700
commitcb454fe10400566214ec690318a0167ff7f5b8ca (patch)
tree8748a7b6973323adfa84ef485037bbb36687981a
parente605a425975b073aafebbb2c09d3ae266be2fd3e (diff)
downloadlinux-linaro-stable-cb454fe10400566214ec690318a0167ff7f5b8ca.tar.gz
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@gmail.com> Link: http://lkml.kernel.org/r/1342746282-28497-4-git-send-email-jmillenbach@gmail.com Signed-off-by: Gokul Caushik <caushik1@gmail.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--arch/x86/boot/compressed/misc.c6
-rw-r--r--arch/x86/boot/compressed/misc.h1
2 files changed, 4 insertions, 3 deletions
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 */