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

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

x86, boot: Switch output functions from command-line flags to conditional compilation 



Changed putstr flagging from parameter to conditional compilation for puts,
debug_putstr, and error_putstr. This allows for space savings since most
configurations won't use this feature.

Signed-off-by: default avatarJoe Millenbach <jmillenbach@gmail.com>
Link: http://lkml.kernel.org/r/1342746282-28497-5-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 cb454fe1

arch/x86/boot/compressed/misc.c

+1 −11
Original line number Diff line number Diff line
@@ -169,15 +169,11 @@ static void serial_putchar(int ch) 
	outb(ch, early_serial_base + TXR);

}



void __putstr(int error, const char *s)

void __putstr(const char *s)

{

	int x, y, pos;

	char c;



#ifndef CONFIG_X86_VERBOSE_BOOTUP

	if (!error)

		return;

#endif

	if (early_serial_base) {

		const char *str = s;

		while (*str) {
@@ -223,12 +219,6 @@ void __putstr(int error, const char *s) 
	outb(0xff & (pos >> 1), vidport+1);

}



static void debug_putstr(const char *s)

{

	if (debug)

		putstr(s);

}



void *memset(void *s, int c, size_t n)

{

	int i;

arch/x86/boot/compressed/misc.h

+13 −4
Original line number Diff line number Diff line
@@ -24,10 +24,19 @@ 


/* misc.c */

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)

void __putstr(const char *s);

#define error_putstr(__x)  __putstr(__x)



#ifdef CONFIG_X86_VERBOSE_BOOTUP



#define debug_putstr(__x)  __putstr(__x)



#else



static inline void debug_putstr(const char *s)

{ }



#endif



/* cmdline.c */

int cmdline_find_option(const char *option, char *buffer, int bufsize);