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>
这个提交包含在:
@@ -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");
|
||||
|
@@ -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 */
|
||||
|
在新工单中引用
屏蔽一个用户