diff options
author | Alan Cox <alan@linux.intel.com> | 2010-06-01 16:52:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-10 16:47:41 -0400 |
commit | ff917ba4f1a6189f90ed2c975984d6a1a1dc553d (patch) | |
tree | a53853d16c578dafee829ebe7645e724d184fab9 /drivers/char/vt.c | |
parent | e33ac1c10b6baaac68d18d931e120d8b96e8c5f8 (diff) |
tty: Make vt's have a tty_port
The vt layer isn't safely handling reference counts to tty object on the input
side. Add a tty port structure to the vt layer in order to implement this using
the standard helpers.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char/vt.c')
-rw-r--r-- | drivers/char/vt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 9f67ad919a4a..295af823a074 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
@@ -783,6 +783,7 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */ | |||
783 | if (!vc) | 783 | if (!vc) |
784 | return -ENOMEM; | 784 | return -ENOMEM; |
785 | vc_cons[currcons].d = vc; | 785 | vc_cons[currcons].d = vc; |
786 | tty_port_init(&vc->port); | ||
786 | INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK); | 787 | INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK); |
787 | visual_init(vc, currcons, 1); | 788 | visual_init(vc, currcons, 1); |
788 | if (!*vc->vc_uni_pagedir_loc) | 789 | if (!*vc->vc_uni_pagedir_loc) |
@@ -2921,6 +2922,7 @@ static int __init con_init(void) | |||
2921 | for (currcons = 0; currcons < MIN_NR_CONSOLES; currcons++) { | 2922 | for (currcons = 0; currcons < MIN_NR_CONSOLES; currcons++) { |
2922 | vc_cons[currcons].d = vc = kzalloc(sizeof(struct vc_data), GFP_NOWAIT); | 2923 | vc_cons[currcons].d = vc = kzalloc(sizeof(struct vc_data), GFP_NOWAIT); |
2923 | INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK); | 2924 | INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK); |
2925 | tty_port_init(&vc->port); | ||
2924 | visual_init(vc, currcons, 1); | 2926 | visual_init(vc, currcons, 1); |
2925 | vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size, GFP_NOWAIT); | 2927 | vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size, GFP_NOWAIT); |
2926 | vc_init(vc, vc->vc_rows, vc->vc_cols, | 2928 | vc_init(vc, vc->vc_rows, vc->vc_cols, |