Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3de66a175d2014246a2e990412e5750922e5c7d8
Commit: 3de66a175d2014246a2e990412e5750922e5c7d8
Parent: 0e349b0e2d90eb1bb76d16c48d0127feebfeeb89
Author: Grant Likely <[EMAIL PROTECTED]>
AuthorDate: Wed Feb 6 10:23:41 2008 -0700
Committer: Grant Likely <[EMAIL PROTECTED]>
CommitDate: Wed Feb 6 10:23:41 2008 -0700
[POWERPC] Eliminate broken OF console initialization.
Probing of the console at console_initcall time is broken. It tries to
call memory allocation routines which aren't initialized yet.
Problem solved by removing the early probe entirely. The console init
is called again anyway after the uartlite device is initialized and the
memory allocation routines can be called safely.
Signed-off-by: Grant Likely <[EMAIL PROTECTED]>
Acked-by: Peter Korsgaard <[EMAIL PROTECTED]>
---
drivers/serial/uartlite.c | 32 +-------------------------------
1 files changed, 1 insertions(+), 31 deletions(-)
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index b22023f..1a7bcce 100644
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -389,32 +389,6 @@ static void ulite_console_write(struct console *co, const
char *s,
spin_unlock_irqrestore(&port->lock, flags);
}
-#if defined(CONFIG_OF)
-static inline void __init ulite_console_of_find_device(int id)
-{
- struct device_node *np;
- struct resource res;
- const unsigned int *of_id;
- int rc;
-
- for_each_matching_node(np, ulite_of_match) {
- of_id = of_get_property(np, "port-number", NULL);
- if ((!of_id) || (*of_id != id))
- continue;
-
- rc = of_address_to_resource(np, 0, &res);
- if (rc)
- continue;
-
- ulite_ports[id].mapbase = res.start;
- of_node_put(np);
- return;
- }
-}
-#else /* CONFIG_OF */
-static inline void __init ulite_console_of_find_device(int id) { /* do nothing
*/ }
-#endif /* CONFIG_OF */
-
static int __init ulite_console_setup(struct console *co, char *options)
{
struct uart_port *port;
@@ -428,11 +402,7 @@ static int __init ulite_console_setup(struct console *co,
char *options)
port = &ulite_ports[co->index];
- /* Check if it is an OF device */
- if (!port->mapbase)
- ulite_console_of_find_device(co->index);
-
- /* Do we have a device now? */
+ /* Has the device been initialized yet? */
if (!port->mapbase) {
pr_debug("console on ttyUL%i not present\n", co->index);
return -ENODEV;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
