The patch titled
serial-jsm-correctly-support-4-8-port-boards-update
has been removed from the -mm tree. Its filename was
serial-jsm-correctly-support-4-8-port-boards-update.patch
This patch was dropped because it is obsolete
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: serial-jsm-correctly-support-4-8-port-boards-update
From: "Alexander Y. Fomichev" <git.user@xxxxxxxxx>
Signed-off-by: Alexander Y. Fomichev <git.user@xxxxxxxx
Cc: Adam Lackorzynski <adam@xxxxxxxxxxxxxxxxxxxx>
Cc: Scott H Kilau <Scott_Kilau@xxxxxxxx>
Cc: Wendy Xiong <wendyx@xxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>m>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/serial/jsm/jsm_tty.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff -puN drivers/serial/jsm/jsm_tty.c~serial-jsm-correctly-support-4-8-port-boards-update drivers/serial/jsm/jsm_tty.c
--- a/drivers/serial/jsm/jsm_tty.c~serial-jsm-correctly-support-4-8-port-boards-update
+++ a/drivers/serial/jsm/jsm_tty.c
@@ -34,6 +34,7 @@
#include "jsm.h"
static DECLARE_BITMAP(linemap, MAXLINES);
+static DEFINE_MUTEX(linemap_mutex);
static void jsm_carrier(struct jsm_channel *ch);
@@ -449,6 +450,9 @@ int __devinit jsm_uart_port_init(struct
brd->nasync = brd->maxports;
+ /* protect linemap for whole range of line numbers*/
+ mutex_lock(&linemap_mutex);
+
/* Set up channel variables */
for (i = 0; i < brd->nasync; i++, ch = brd->channels[i]) {
@@ -467,13 +471,14 @@ int __devinit jsm_uart_port_init(struct
printk(KERN_INFO "linemap is full, added device failed\n");
continue;
} else
- __set_bit((int)line, linemap);
+ set_bit((int)line, linemap);
brd->channels[i]->uart_port.line = line;
if (uart_add_one_port (&jsm_uart_driver, &brd->channels[i]->uart_port))
printk(KERN_INFO "Added device failed\n");
else
printk(KERN_INFO "Added device \n");
}
+ mutex_unlock(&linemap_mutex);
jsm_printk(INIT, INFO, &brd->pci_dev, "finish\n");
return 0;
@@ -495,6 +500,8 @@ int jsm_remove_uart_port(struct jsm_boar
brd->nasync = brd->maxports;
+ mutex_lock(&linemap_mutex);
+
/* Set up channel variables */
for (i = 0; i < brd->nasync; i++) {
@@ -502,11 +509,12 @@ int jsm_remove_uart_port(struct jsm_boar
continue;
ch = brd->channels[i];
-
- __clear_bit((int)(ch->uart_port.line), linemap);
+ clear_bit((int)(ch->uart_port.line), linemap);
uart_remove_one_port(&jsm_uart_driver, &brd->channels[i]->uart_port);
}
+ mutex_unlock(&linemap_mutex);
+
jsm_printk(INIT, INFO, &brd->pci_dev, "finish\n");
return 0;
}
_
Patches currently in -mm which might be from git.user@xxxxxxxxx are
serial-jsm-correctly-support-4-8-port-boards.patch
serial-jsm-correctly-support-4-8-port-boards-fix.patch
serial-jsm-correctly-support-4-8-port-boards-update.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
