[PATCH] esp: lock_kernel push down

[Alan Cox]

Push the BKL down into a few internal bits of code in this driver.

Signed-off-by: Alan Cox <[EMAIL PROTECTED]>

diff -u --new-file --recursive --exclude-from /usr/src/exclude 
linux.vanilla-2.6.25-rc2-mm1/drivers/char/esp.c 
linux-2.6.25-rc2-mm1/drivers/char/esp.c
--- linux.vanilla-2.6.25-rc2-mm1/drivers/char/esp.c     2008-02-19 
11:03:00.000000000 +0000
+++ linux-2.6.25-rc2-mm1/drivers/char/esp.c     2008-02-20 11:45:43.000000000 
+0000
@@ -1355,6 +1355,7 @@
 {
        struct serial_struct tmp;
   
+       lock_kernel();
        memset(&tmp, 0, sizeof(tmp));
        tmp.type = PORT_16550A;
        tmp.line = info->line;
@@ -1367,6 +1368,7 @@
        tmp.closing_wait = info->closing_wait;
        tmp.custom_divisor = info->custom_divisor;
        tmp.hub6 = 0;
+       unlock_kernel();
        if (copy_to_user(retinfo,&tmp,sizeof(*retinfo)))
                return -EFAULT;
        return 0;
@@ -1381,6 +1383,7 @@
                return -EFAULT;
 
        memset(&tmp, 0, sizeof(tmp));
+       lock_kernel();
        tmp.rx_timeout = info->config.rx_timeout;
        tmp.rx_trigger = info->config.rx_trigger;
        tmp.tx_trigger = info->config.tx_trigger;
@@ -1388,7 +1391,8 @@
        tmp.flow_on = info->config.flow_on;
        tmp.pio_threshold = info->config.pio_threshold;
        tmp.dma_channel = (info->stat_flags & ESP_STAT_NEVER_DMA ? 0 : dma);
-
+       unlock_kernel();
+       
        return copy_to_user(retinfo, &tmp, sizeof(*retinfo)) ? -EFAULT : 0;
 }
 
@@ -1766,6 +1770,7 @@
        struct serial_icounter_struct __user *p_cuser;  /* user space */
        void __user *argp = (void __user *)arg;
        unsigned long flags;
+       int ret;
 
        if (serial_paranoia_check(info, tty->name, "rs_ioctl"))
                return -ENODEV;
@@ -1783,7 +1788,10 @@
                case TIOCGSERIAL:
                        return get_serial_info(info, argp);
                case TIOCSSERIAL:
-                       return set_serial_info(info, argp);
+                       lock_kernel();
+                       ret = set_serial_info(info, argp);
+                       unlock_kernel();
+                       return ret;
                case TIOCSERCONFIG:
                        /* do not reconfigure after initial configuration */
                        return 0;
@@ -1855,11 +1863,13 @@
                                return -EFAULT;
 
                        return 0;
-       case TIOCGHAYESESP:
-               return get_esp_config(info, argp);
-       case TIOCSHAYESESP:
-               return set_esp_config(info, argp);
-
+               case TIOCGHAYESESP:
+                       return get_esp_config(info, argp);
+               case TIOCSHAYESESP:
+                       lock_kernel();
+                       ret = set_esp_config(info, argp);
+                       unlock_kernel();
+                       return ret;
                default:
                        return -ENOIOCTLCMD;
                }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/