From e16ddcc48b897304af5704d6eea129a79ac76fff Mon Sep 17 00:00:00 2001
From: Joe Millenbach <jmillenbach@gmail.com>
Date: Thu, 19 Jul 2012 18:04:38 -0700
Subject: [PATCH] --- yaml --- r: 318410 b: refs/heads/master c:
 cb454fe10400566214ec690318a0167ff7f5b8ca h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86/boot/compressed/misc.c | 6 +++---
 trunk/arch/x86/boot/compressed/misc.h | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2d3fa79ccc52..74462bc5308c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e605a425975b073aafebbb2c09d3ae266be2fd3e
+refs/heads/master: cb454fe10400566214ec690318a0167ff7f5b8ca
diff --git a/trunk/arch/x86/boot/compressed/misc.c b/trunk/arch/x86/boot/compressed/misc.c
index 49c6d5632ef7..de1d54d8bddc 100644
--- a/trunk/arch/x86/boot/compressed/misc.c
+++ b/trunk/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/trunk/arch/x86/boot/compressed/misc.h b/trunk/arch/x86/boot/compressed/misc.h
index 3f19c81a6203..4c1bfb69e0d8 100644
--- a/trunk/arch/x86/boot/compressed/misc.h
+++ b/trunk/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 */