* [PATCH-mmotm] sh4: make the bios early console support depend on EARLY_PRINTK
@ 2013-04-03 14:23 Paul Gortmaker
0 siblings, 0 replies; only message in thread
From: Paul Gortmaker @ 2013-04-03 14:23 UTC (permalink / raw)
To: Andrew Morton
Cc: Geert Uytterhoeven, linux-sh, linux-kernel, Paul Gortmaker,
Thomas Gleixner, Paul Mundt
The commit "early_printk: consolidate random copies of identical code"
introduces a build failure for the lboxre2_defconfig because arch/sh
unconditionally assumes that there will be an early_console struct
present that it can populate with bios routines to drive the
early printk support.
Making this whole block conditional on EARLY_PRINTK solves the
problem and gets rid of unused runtime code for when the feature
is disabled at the same time.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
Related mmotm patches:
* early_printk-consolidate-random-copies-of-identical-code.patch
* early_printk-consolidate-random-copies-of-identical-code-v3.patch
* early_printk-consolidate-random-copies-of-identical-code-v3-fix.patch
* include-linux-printkh-include-stdargh.patch
arch/sh/kernel/sh_bios.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/sh/kernel/sh_bios.c b/arch/sh/kernel/sh_bios.c
index a5b51b9..fe584e5 100644
--- a/arch/sh/kernel/sh_bios.c
+++ b/arch/sh/kernel/sh_bios.c
@@ -104,6 +104,7 @@ void sh_bios_vbr_reload(void)
);
}
+#ifdef CONFIG_EARLY_PRINTK
/*
* Print a string through the BIOS
*/
@@ -168,3 +169,4 @@ static int __init setup_early_printk(char *buf)
return 0;
}
early_param("earlyprintk", setup_early_printk);
+#endif
--
1.8.1.2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-04-03 14:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-03 14:23 [PATCH-mmotm] sh4: make the bios early console support depend on EARLY_PRINTK Paul Gortmaker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).