kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cyclades: Kill off BKL usage

Browse source 
Use the port mutext for config setting, the rest is locked sufficiently
anyway that the BKL makes no odds.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox 2010-06-01 22:52:47 +02:00 committed by Greg Kroah-Hartman
parent f602501d90
commit 25c3cdf80c
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/char/cyclades.c
View file

@ -65,7 +65,6 @@
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/tty_flip.h> #include <linux/tty_flip.h>
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/smp_lock.h>
#include <linux/major.h> #include <linux/major.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/fcntl.h> #include <linux/fcntl.h>
@ -1655,7 +1654,6 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
return; /* Just in case.... */ return; /* Just in case.... */
orig_jiffies = jiffies; orig_jiffies = jiffies;
lock_kernel();
/* /*
* Set the check interval to be 1/5 of the estimated time to * Set the check interval to be 1/5 of the estimated time to
* send a single character, and make it at least 1. The check * send a single character, and make it at least 1. The check
@ -1702,7 +1700,6 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
} }
/* Run one more char cycle */ /* Run one more char cycle */
msleep_interruptible(jiffies_to_msecs(char_time * 5)); msleep_interruptible(jiffies_to_msecs(char_time * 5));
unlock_kernel();
#ifdef CY_DEBUG_WAIT_UNTIL_SENT #ifdef CY_DEBUG_WAIT_UNTIL_SENT
printk(KERN_DEBUG "Clean (jiff=%lu)...done\n", jiffies); printk(KERN_DEBUG "Clean (jiff=%lu)...done\n", jiffies);
#endif #endif
@ -1959,7 +1956,6 @@ static int cy_chars_in_buffer(struct tty_struct *tty)
int char_count; int char_count;
__u32 tx_put, tx_get, tx_bufsize; __u32 tx_put, tx_get, tx_bufsize;
lock_kernel();
tx_get = readl(&buf_ctrl->tx_get); tx_get = readl(&buf_ctrl->tx_get);
tx_put = readl(&buf_ctrl->tx_put); tx_put = readl(&buf_ctrl->tx_put);
tx_bufsize = readl(&buf_ctrl->tx_bufsize); tx_bufsize = readl(&buf_ctrl->tx_bufsize);
@ -1971,7 +1967,6 @@ static int cy_chars_in_buffer(struct tty_struct *tty)
printk(KERN_DEBUG "cyc:cy_chars_in_buffer ttyC%d %d\n", printk(KERN_DEBUG "cyc:cy_chars_in_buffer ttyC%d %d\n",
info->line, info->xmit_cnt + char_count); info->line, info->xmit_cnt + char_count);
#endif #endif
unlock_kernel();
return info->xmit_cnt + char_count; return info->xmit_cnt + char_count;
} }
#endif /* Z_EXT_CHARS_IN_BUFFER */ #endif /* Z_EXT_CHARS_IN_BUFFER */
@ -2359,17 +2354,22 @@ cy_set_serial_info(struct cyclades_port *info, struct tty_struct *tty,
struct serial_struct __user *new_info) struct serial_struct __user *new_info)
{ {
struct serial_struct new_serial; struct serial_struct new_serial;
int ret;
if (copy_from_user(&new_serial, new_info, sizeof(new_serial))) if (copy_from_user(&new_serial, new_info, sizeof(new_serial)))
return -EFAULT; return -EFAULT;
mutex_lock(&info->port.mutex);
if (!capable(CAP_SYS_ADMIN)) { if (!capable(CAP_SYS_ADMIN)) {
if (new_serial.close_delay != info->port.close_delay || if (new_serial.close_delay != info->port.close_delay ||
new_serial.baud_base != info->baud || new_serial.baud_base != info->baud ||
(new_serial.flags & ASYNC_FLAGS & (new_serial.flags & ASYNC_FLAGS &
~ASYNC_USR_MASK) != ~ASYNC_USR_MASK) !=
(info->port.flags & ASYNC_FLAGS & ~ASYNC_USR_MASK)) (info->port.flags & ASYNC_FLAGS & ~ASYNC_USR_MASK))
{
mutex_unlock(&info->port.mutex);
return -EPERM; return -EPERM;
}
info->port.flags = (info->port.flags & ~ASYNC_USR_MASK) | info->port.flags = (info->port.flags & ~ASYNC_USR_MASK) |
(new_serial.flags & ASYNC_USR_MASK); (new_serial.flags & ASYNC_USR_MASK);
info->baud = new_serial.baud_base; info->baud = new_serial.baud_base;
@ -2392,10 +2392,12 @@ cy_set_serial_info(struct cyclades_port *info, struct tty_struct *tty,
check_and_exit: check_and_exit:
if (info->port.flags & ASYNC_INITIALIZED) { if (info->port.flags & ASYNC_INITIALIZED) {
cy_set_line_char(info, tty); cy_set_line_char(info, tty);
return 0; ret = 0;
} else { } else {
return cy_startup(info, tty); ret = cy_startup(info, tty);
} }
mutex_unlock(&info->port.mutex);
return ret;
} /* set_serial_info */ } /* set_serial_info */
/* /*
@ -2438,7 +2440,6 @@ static int cy_tiocmget(struct tty_struct *tty, struct file *file)
card = info->card; card = info->card;
lock_kernel();
if (!cy_is_Z(card)) { if (!cy_is_Z(card)) {
unsigned long flags; unsigned long flags;
int channel = info->line - card->first_line; int channel = info->line - card->first_line;
@ -2478,7 +2479,6 @@ static int cy_tiocmget(struct tty_struct *tty, struct file *file)
((lstatus & C_RS_CTS) ? TIOCM_CTS : 0); ((lstatus & C_RS_CTS) ? TIOCM_CTS : 0);
} }
end: end:
unlock_kernel();
return result; return result;
} /* cy_tiomget */ } /* cy_tiomget */
@ -2696,7 +2696,6 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
printk(KERN_DEBUG "cyc:cy_ioctl ttyC%d, cmd = %x arg = %lx\n", printk(KERN_DEBUG "cyc:cy_ioctl ttyC%d, cmd = %x arg = %lx\n",
info->line, cmd, arg); info->line, cmd, arg);
#endif #endif
lock_kernel();
switch (cmd) { switch (cmd) {
case CYGETMON: case CYGETMON:
@ -2817,7 +2816,6 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
default: default:
ret_val = -ENOIOCTLCMD; ret_val = -ENOIOCTLCMD;
} }
unlock_kernel();
#ifdef CY_DEBUG_OTHER #ifdef CY_DEBUG_OTHER
printk(KERN_DEBUG "cyc:cy_ioctl done\n"); printk(KERN_DEBUG "cyc:cy_ioctl done\n");