x86, boot: Exclude early_serial_console.c if can't use it.
Removes early_serial_console.c code if we don't have the config option that enables it (EARLY_PRINTK). When disabling this code, make early_serial_base a constant 0 to allow the compiler to optimize away the code that checks for early_serial_base. Signed-off-by: Joe Millenbach <jmillenbach@gmail.com> Link: http://lkml.kernel.org/r/1342746282-28497-7-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:
parent
641a1cebfe
commit
cec49df9d3
|
@ -1,5 +1,9 @@
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
|
|
||||||
|
#ifdef CONFIG_EARLY_PRINTK
|
||||||
|
|
||||||
int early_serial_base;
|
int early_serial_base;
|
||||||
|
|
||||||
#include "../early_serial_console.c"
|
#include "../early_serial_console.c"
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
@ -43,7 +43,17 @@ int cmdline_find_option(const char *option, char *buffer, int bufsize);
|
||||||
int cmdline_find_option_bool(const char *option);
|
int cmdline_find_option_bool(const char *option);
|
||||||
|
|
||||||
/* early_serial_console.c */
|
/* early_serial_console.c */
|
||||||
|
#ifdef CONFIG_EARLY_PRINTK
|
||||||
|
|
||||||
extern int early_serial_base;
|
extern int early_serial_base;
|
||||||
void console_init(void);
|
void console_init(void);
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
static const int early_serial_base;
|
||||||
|
static inline void console_init(void)
|
||||||
|
{ }
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue