diff options
-rw-r--r-- | arch/x86/boot/compressed/misc.c | 6 | ||||
-rw-r--r-- | 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 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) | |||
270 | 270 | ||
271 | static void error(char *x) | 271 | static void error(char *x) |
272 | { | 272 | { |
273 | __putstr(1, "\n\n"); | 273 | error_putstr("\n\n"); |
274 | __putstr(1, x); | 274 | error_putstr(x); |
275 | __putstr(1, "\n\n -- System halted"); | 275 | error_putstr("\n\n -- System halted"); |
276 | 276 | ||
277 | while (1) | 277 | while (1) |
278 | asm("hlt"); | 278 | 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 @@ | |||
26 | extern struct boot_params *real_mode; /* Pointer to real-mode data */ | 26 | extern struct boot_params *real_mode; /* Pointer to real-mode data */ |
27 | void __putstr(int error, const char *s); | 27 | void __putstr(int error, const char *s); |
28 | #define putstr(__x) __putstr(0, __x) | 28 | #define putstr(__x) __putstr(0, __x) |
29 | #define error_putstr(__x) __putstr(1, __x) | ||
29 | #define puts(__x) __putstr(0, __x) | 30 | #define puts(__x) __putstr(0, __x) |
30 | 31 | ||
31 | /* cmdline.c */ | 32 | /* cmdline.c */ |