The patch titled
serial/parisc: fix early_serial_setup() regression
has been removed from the -mm tree. Its filename was
serial-parisc-fix-early_serial_setup-regression.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: serial/parisc: fix early_serial_setup() regression
From: Helge Deller <deller@xxxxxx>
commit b430428a188e8a434325e251d0704af4b88b4711,
"8250: Don't clobber spinlocks."
introduced a regression on the parisc architecture, which broke the
handover to the serial port at boottime.
early_serial_setup() was changed to only copy a subset of the uart_port
fields, and sadly the "type" and "line" fields were forgotten and thus the
serial port was not initialized and could not be used for a handover.
This patch fixes this by copying the missing fields.
As this change to early_serial_setup() doesn't need an initialized
spinlock in the uart_port struct any longer, we can drop the spinlock
initialization in the superio driver.
Cc: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Cc: Tomaso Paoletti <tpaoletti@xxxxxxxxxxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kyle McMartin <kyle@xxxxxxxxxxx>
Signed-off-by: Helge Deller <deller@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/parisc/superio.c | 1 -
drivers/serial/8250.c | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff -puN drivers/parisc/superio.c~serial-parisc-fix-early_serial_setup-regression drivers/parisc/superio.c
--- a/drivers/parisc/superio.c~serial-parisc-fix-early_serial_setup-regression
+++ a/drivers/parisc/superio.c
@@ -405,7 +405,6 @@ static void __init superio_serial_init(v
serial_port.type = PORT_16550A;
serial_port.uartclk = 115200*16;
serial_port.fifosize = 16;
- spin_lock_init(&serial_port.lock);
/* serial port #1 */
serial_port.iobase = sio_dev.sp1_base;
diff -puN drivers/serial/8250.c~serial-parisc-fix-early_serial_setup-regression drivers/serial/8250.c
--- a/drivers/serial/8250.c~serial-parisc-fix-early_serial_setup-regression
+++ a/drivers/serial/8250.c
@@ -2839,6 +2839,8 @@ int __init early_serial_setup(struct uar
p->flags = port->flags;
p->mapbase = port->mapbase;
p->private_data = port->private_data;
+ p->type = port->type;
+ p->line = port->line;
set_io_from_upio(p);
if (port->serial_in)
_
Patches currently in -mm which might be from deller@xxxxxx are
origin.patch
input-keyboard-hilkbdc-fix-crash-when-removing-hilkbd-module.patch
drivers-input-serio-hp_sdcc-fix-crash-when-removing-hp_sdc-module.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
