The patch titled
hvc_console: remove num_vterms and some dead code
has been added to the -mm tree. Its filename is
hvc_console-remove-num_vterms-and-some-dead-code.patch
Patches currently in -mm which might be from [EMAIL PROTECTED] are
hvc_console-rearrange-code.patch
hvc_console-match-vio-and-console-devices-using-vterm-numbers.patch
hvc_console-dont-always-kick-the-poll-thread-in-interrupt.patch
hvc_console-magic_sysrq-should-only-be-on-console-channel.patch
hvc_console-unregister-the-console-in-the-exit-routine.patch
hvc_console-add-missing-include.patch
hvc_console-remove-num_vterms-and-some-dead-code.patch
hvc_console-statically-initialize-the-vtermnos-array.patch
hvc_console-add-some-sanity-checks.patch
hvc_console-separate-hvc_console-and-vio-code.patch
hvc_console-separate-hvc_console-and-vio-code-2.patch
hvc_console-register-ops-when-setting-up-hvc_console.patch
hvc_console-separate-the-nul-character-filtering-from-get_hvc_chars.patch
hvc_console-use-hvc_get_chars-in-hvsi-code.patch
From: Milton Miller <[EMAIL PROTECTED]>
num_vterms hasn't been used since the hotplug support went in. Also, remove a
dead code line from a list_for_each_entry conversion.
Signed-off-by: Milton Miller <[EMAIL PROTECTED]>
Signed-off-by: Anton Blanchard <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/char/hvc_console.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff -puN
drivers/char/hvc_console.c~hvc_console-remove-num_vterms-and-some-dead-code
drivers/char/hvc_console.c
---
25/drivers/char/hvc_console.c~hvc_console-remove-num_vterms-and-some-dead-code
Wed Jul 6 14:00:31 2005
+++ 25-akpm/drivers/char/hvc_console.c Wed Jul 6 14:00:31 2005
@@ -146,8 +146,6 @@ struct hvc_struct *hvc_get_by_index(int
*/
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
@@ -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;
}
@@ -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);
@@ -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;
_
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
