kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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: Joe Millenbach <jmillenbach@gmail.com>
Link: http://lkml.kernel.org/r/1342746282-28497-5-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:39 -07:00 committed by H. Peter Anvin
parent cb454fe104
commit 7aac3015b5
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/x86/boot/compressed/misc.c
View file

@ -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;

17
arch/x86/boot/compressed/misc.h
View file

@ -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);