AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-11 21:06:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

x86, boot: Changed error putstr path to match new debug_putstr format

Browse Source 
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>
This commit is contained in:
Joe Millenbach 2012-07-19 18:04:38 -07:00 committed by H. Peter Anvin
parent e605a42597
commit cb454fe104
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/boot/compressed/misc.c
View File

@ -270,9 +270,9 @@ void *memcpy(void *dest, const void *src, size_t n)
static void error(char *x) static void error(char *x)
{ {
__putstr(1, "\n\n"); error_putstr("\n\n");
__putstr(1, x); error_putstr(x);
__putstr(1, "\n\n -- System halted"); error_putstr("\n\n -- System halted");
while (1) while (1)
asm("hlt"); asm("hlt");

1
arch/x86/boot/compressed/misc.h
View File

@ -26,6 +26,7 @@
extern struct boot_params *real_mode; /* Pointer to real-mode data */ extern struct boot_params *real_mode; /* Pointer to real-mode data */
void __putstr(int error, const char *s); void __putstr(int error, const char *s);
#define putstr(__x) __putstr(0, __x) #define putstr(__x) __putstr(0, __x)
#define error_putstr(__x) __putstr(1, __x)
#define puts(__x) __putstr(0, __x) #define puts(__x) __putstr(0, __x)
/* cmdline.c */ /* cmdline.c */