diff options
| author | Joe Millenbach <jmillenbach@gmail.com> | 2012-07-19 21:04:38 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-07-21 14:07:22 -0400 |
| commit | cb454fe10400566214ec690318a0167ff7f5b8ca (patch) | |
| tree | 8748a7b6973323adfa84ef485037bbb36687981a /arch/x86/boot/compressed/misc.c | |
| parent | e605a425975b073aafebbb2c09d3ae266be2fd3e (diff) | |
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>
Diffstat (limited to 'arch/x86/boot/compressed/misc.c')
| -rw-r--r-- | arch/x86/boot/compressed/misc.c | 6 |
1 files changed, 3 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"); |