Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb454fe1 authored by Joe Millenbach's avatar Joe Millenbach Committed by H. Peter Anvin
Browse files

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: default avatarJoe Millenbach <jmillenbach@gmail.com>
Link: http://lkml.kernel.org/r/1342746282-28497-4-git-send-email-jmillenbach@gmail.com


Signed-off-by: default avatarGokul Caushik <caushik1@gmail.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent e605a425

arch/x86/boot/compressed/misc.c

+3 −3
Original line number Diff line number Diff line
@@ -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");

arch/x86/boot/compressed/misc.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */