Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4227
b: refs/heads/master
c: 5f6d9c0
h: refs/heads/master
i:
  4225: 18f6917
  4223: 15d672f
v: v3
  • Loading branch information
Milton Miller authored and Linus Torvalds committed Jul 8, 2005
1 parent 30c0267 commit ac13c87
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e51d8c90a5ead16810302b2dc5127724c9045e77
refs/heads/master: 5f6d9c072df162a8601a09e6c63fd0e4f5aecd06
8 changes: 2 additions & 6 deletions trunk/drivers/char/hvc_console.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,6 @@ struct hvc_struct *hvc_get_by_index(int index)
*/
static uint32_t vtermnos[MAX_NR_HVC_CONSOLES];

/* Used for accounting purposes */
static int num_vterms = 0;

/*
* Console APIs, NOT TTY. These APIs are available immediately when
Expand Down Expand Up @@ -219,7 +217,7 @@ static int __init hvc_console_init(void)

for (i=0; i<MAX_NR_HVC_CONSOLES; i++)
vtermnos[i] = -1;
num_vterms = hvc_find_vtys();
hvc_find_vtys();
register_console(&hvc_con_driver);
return 0;
}
Expand Down Expand Up @@ -651,7 +649,6 @@ int khvcd(void *unused)
if (cpus_empty(cpus_in_xmon)) {
spin_lock(&hvc_structs_lock);
list_for_each_entry(hp, &hvc_structs, next) {
/*hp = list_entry(node, struct hvc_struct, * next); */
poll_mask |= hvc_poll(hp);
}
spin_unlock(&hvc_structs_lock);
Expand Down Expand Up @@ -811,9 +808,8 @@ int __init hvc_init(void)
{
int rc;

/* We need more than num_vterms adapters due to hotplug additions. */
/* We need more than hvc_count adapters due to hotplug additions. */
hvc_driver = alloc_tty_driver(HVC_ALLOC_TTY_ADAPTERS);
/* hvc_driver = alloc_tty_driver(num_vterms); */
if (!hvc_driver)
return -ENOMEM;

Expand Down

0 comments on commit ac13c87

Please sign in to comment.