The patch titled
Subject: sh4: make the bios early console support depend on EARLY_PRINTK
has been removed from the -mm tree. Its filename was
early_printk-consolidate-random-copies-of-identical-code-v3-fix-fix.patch
This patch was dropped because it was folded into early_printk-consolidate-random-copies-of-identical-code.patch
------------------------------------------------------
From: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Subject: sh4: make the bios early console support depend on EARLY_PRINTK
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.
Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Reported-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/sh/kernel/sh_bios.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN arch/sh/kernel/sh_bios.c~early_printk-consolidate-random-copies-of-identical-code-v3-fix-fix arch/sh/kernel/sh_bios.c
--- a/arch/sh/kernel/sh_bios.c~early_printk-consolidate-random-copies-of-identical-code-v3-fix-fix
+++ a/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(cha
return 0;
}
early_param("earlyprintk", setup_early_printk);
+#endif
_
Patches currently in -mm which might be from paul.gortmaker@xxxxxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
