Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / parisc / kernel / pdc_cons.c

diff --git a/arch/parisc/kernel/pdc_cons.c b/arch/parisc/kernel/pdc_cons.c
index 66d1f17fdb9406acaaaf11ea9b9436a58c26ea1e..fc770be465ff648cb6e5d33dc883e1782531613a 100644 (file)
--- a/arch/parisc/kernel/pdc_cons.c
+++ b/arch/parisc/kernel/pdc_cons.c
@@ -92,8 +92,6 @@ static int pdc_console_setup(struct console *co, char *options)
 
 static struct timer_list pdc_console_timer;
 
-extern struct console * console_drivers;
-
 static int pdc_console_tty_open(struct tty_struct *tty, struct file *filp)
 {
 
@@ -169,11 +167,13 @@ static int __init pdc_console_tty_driver_init(void)
         * It is unregistered if the pdc console was not selected as the
         * primary console. */
 
-       struct console *tmp = console_drivers;
+       struct console *tmp;
 
-       for (tmp = console_drivers; tmp; tmp = tmp->next)
+       console_lock();
+       for_each_console(tmp)
                if (tmp == &pdc_cons)
                        break;
+       console_unlock();
 
        if (!tmp) {
                printk(KERN_INFO "PDC console driver not registered anymore, not creating %s\n", pdc_cons.name);