summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-12-09 14:46:53 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2010-12-09 14:46:53 +1100
commit6468580574c41cf4c3b3e6293d6e8e2192bf045c (patch)
treed6abe2880576ca62bf265b083705f585d16e6f10 /arch
parentb1e381b567cef8e4586354ce43a86a622a8c1c96 (diff)
parent16c63f8ea49c3fcb9eac7ebc511f5c821d3c55c2 (diff)
Merge remote branch 'tty/tty-next'
Diffstat (limited to 'arch')
-rw-r--r--arch/parisc/kernel/pdc_cons.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/parisc/kernel/pdc_cons.c b/arch/parisc/kernel/pdc_cons.c
index 66d1f17fdb94..11bdd68e5762 100644
--- 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)
+ acquire_console_sem();
+ for_each_console(tmp)
if (tmp == &pdc_cons)
break;
+ release_console_sem();
if (!tmp) {
printk(KERN_INFO "PDC console driver not registered anymore, not creating %s\n", pdc_cons.name);