* [PATCH] ia64 kgdb
@ 2004-06-28 18:09 Robert Picco
2004-06-28 18:13 ` Jesse Barnes
0 siblings, 1 reply; 3+ messages in thread
From: Robert Picco @ 2004-06-28 18:09 UTC (permalink / raw)
To: Andrew Morton, linux-kernel
Hi Andrew:
This fixes the broken kgdb patch.
thanks,
Bob
Signed-off-by: Bob Picco at Robert.Picco@hp.com
diff -ruN -X /home/picco/losl/dontdiff linux-2.6.7-mm3-orig/drivers/firmware/pcdp.c linux-2.6.7-mm3-kgdb/drivers/firmware/pcdp.c
--- linux-2.6.7-mm3-orig/drivers/firmware/pcdp.c 2004-06-27 13:32:37.000000000 -0400
+++ linux-2.6.7-mm3-kgdb/drivers/firmware/pcdp.c 2004-06-28 10:16:15.000000000 -0400
@@ -51,13 +51,20 @@
}
static void __init
+#ifndef CONFIG_KGDB_EARLY
setup_serial_console(int rev, struct pcdp_uart *uart)
+#else
+setup_serial_console(int rev, struct pcdp_uart *uart, int line)
+#endif
{
#ifdef CONFIG_SERIAL_8250_CONSOLE
struct uart_port port;
static char options[16];
memset(&port, 0, sizeof(port));
+#ifdef CONFIG_KGDB_EARLY
+ port.line = line;
+#endif
port.uartclk = uart->clock_rate;
if (!port.uartclk) /* some FW doesn't supply this */
port.uartclk = BASE_BAUD * 16;
@@ -99,6 +106,9 @@
snprintf(options, sizeof(options), "%lun%d", uart->baud,
uart->bits ? uart->bits : 8);
+#ifdef CONFIG_KGDB_EARLY
+ if (!line)
+#endif
add_preferred_console("ttyS", port.line, options);
printk(KERN_INFO "PCDP: serial console at %s 0x%lx (ttyS%d, options %s)\n",
@@ -145,10 +155,19 @@
for (i = 0, uart = pcdp->uart; i < pcdp->num_uarts; i++, uart++) {
if (uart->flags & PCDP_UART_PRIMARY_CONSOLE || serial) {
if (uart->type == PCDP_CONSOLE_UART) {
+#ifndef CONFIG_KGDB_EARLY
setup_serial_console(pcdp->rev, uart);
return;
+#else
+ setup_serial_console(pcdp->rev, uart, 0);
+ serial = 0;
+#endif
}
}
+#ifdef CONFIG_KGDB_EARLY
+ else if (uart->type == PCDP_DEBUG_UART)
+ setup_serial_console(pcdp->rev, uart, 1);
+#endif
}
end = (struct pcdp_device *) ((u8 *) pcdp + pcdp->length);
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2004-06-28 18:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-06-28 18:09 [PATCH] ia64 kgdb Robert Picco
2004-06-28 18:13 ` Jesse Barnes
2004-06-28 18:26 ` Robert Picco
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox