Subject: [folded-merged] arch-unicore32-kernel-early_printkc-setup_early_printk-missing-initialization-fix.patch removed from -mm tree
To: akpm@xxxxxxxxxxxxxxxxxxxx,gxt@xxxxxxxxxxxxxxx,paul.gortmaker@xxxxxxxxxxxxx,xypron.glpk@xxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 27 Jan 2014 16:54:55 -0800
The patch titled
Subject: arch-unicore32-kernel-early_printkc-setup_early_printk-missing-initialization-fix
has been removed from the -mm tree. Its filename was
arch-unicore32-kernel-early_printkc-setup_early_printk-missing-initialization-fix.patch
This patch was dropped because it was folded into arch-unicore32-kernel-early_printkc-setup_early_printk-missing-initialization.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: arch-unicore32-kernel-early_printkc-setup_early_printk-missing-initialization-fix
simplify code.
Cc: Heinrich Schuchardt <xypron.glpk@xxxxxx>
Cc: Guan Xuetao <gxt@xxxxxxxxxxxxxxx>
Cc: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/unicore32/kernel/early_printk.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff -puN arch/unicore32/kernel/early_printk.c~arch-unicore32-kernel-early_printkc-setup_early_printk-missing-initialization-fix arch/unicore32/kernel/early_printk.c
--- a/arch/unicore32/kernel/early_printk.c~arch-unicore32-kernel-early_printkc-setup_early_printk-missing-initialization-fix
+++ a/arch/unicore32/kernel/early_printk.c
@@ -35,17 +35,11 @@ static struct console early_ocd_console
static int __init setup_early_printk(char *buf)
{
- int keep_early = 0;
-
if (!buf || early_console)
return 0;
- if (strstr(buf, "keep"))
- keep_early = 1;
-
early_console = &early_ocd_console;
-
- if (keep_early)
+ if (strstr(buf, "keep"))
early_console->flags &= ~CON_BOOT;
else
early_console->flags |= CON_BOOT;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
arch-unicore32-kernel-early_printkc-setup_early_printk-missing-initialization.patch
ipc-semc-avoid-overflow-of-semop-undo-semadj-value-fix.patch
ipcmsg-document-barriers-fix.patch
ipcmsg-document-barriers-fix-fix.patch
--
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
