git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "hvc_console: display printk messages on console."
[pandora-kernel.git]
/
drivers
/
tty
/
hvc
/
hvc_console.c
diff --git
a/drivers/tty/hvc/hvc_console.c
b/drivers/tty/hvc/hvc_console.c
index
7430bc3
..
b6b2d18
100644
(file)
--- a/
drivers/tty/hvc/hvc_console.c
+++ b/
drivers/tty/hvc/hvc_console.c
@@
-852,7
+852,7
@@
struct hvc_struct *hvc_alloc(uint32_t vtermno, int data,
* find index to use:
* see if this vterm id matches one registered for console.
*/
* find index to use:
* see if this vterm id matches one registered for console.
*/
- for (i
=
0; i < MAX_NR_HVC_CONSOLES; i++)
+ for (i
=
0; i < MAX_NR_HVC_CONSOLES; i++)
if (vtermnos[i] == hp->vtermno &&
cons_ops[i] == hp->ops)
break;
if (vtermnos[i] == hp->vtermno &&
cons_ops[i] == hp->ops)
break;
@@
-862,13
+862,9
@@
struct hvc_struct *hvc_alloc(uint32_t vtermno, int data,
i = ++last_hvc;
hp->index = i;
i = ++last_hvc;
hp->index = i;
- hvc_console.index = i;
- vtermnos[i] = vtermno;
- cons_ops[i] = ops;
list_add_tail(&(hp->next), &hvc_structs);
spin_unlock(&hvc_structs_lock);
list_add_tail(&(hp->next), &hvc_structs);
spin_unlock(&hvc_structs_lock);
- register_console(&hvc_console);
return hp;
}
return hp;
}
@@
-879,7
+875,6
@@
int hvc_remove(struct hvc_struct *hp)
unsigned long flags;
struct tty_struct *tty;
unsigned long flags;
struct tty_struct *tty;
- unregister_console(&hvc_console);
spin_lock_irqsave(&hp->lock, flags);
tty = tty_kref_get(hp->tty);
spin_lock_irqsave(&hp->lock, flags);
tty = tty_kref_get(hp->tty);