613655fa39
All these files use the big kernel lock in a trivial way to serialize their private file operations, typically resulting from an earlier semi-automatic pushdown from VFS. None of these drivers appears to want to lock against other code, and they all use the BKL as the top-level lock in their file operations, meaning that there is no lock-order inversion problem. Consequently, we can remove the BKL completely, replacing it with a per-file mutex in every case. Using a scripted approach means we can avoid typos. These drivers do not seem to be under active maintainance from my brief investigation. Apologies to those maintainers that I have missed. file=$1 name=$2 if grep -q lock_kernel ${file} ; then if grep -q 'include.*linux.mutex.h' ${file} ; then sed -i '/include.*<linux\/smp_lock.h>/d' ${file} else sed -i 's/include.*<linux\/smp_lock.h>.*$/include <linux\/mutex.h>/g' ${file} fi sed -i ${file} \ -e "/^#include.*linux.mutex.h/,$ { 1,/^\(static\|int\|long\)/ { /^\(static\|int\|long\)/istatic DEFINE_MUTEX(${name}_mutex); } }" \ -e "s/\(un\)*lock_kernel\>[ ]*()/mutex_\1lock(\&${name}_mutex)/g" \ -e '/[ ]*cycle_kernel_lock();/d' else sed -i -e '/include.*\<smp_lock.h\>/d' ${file} \ -e '/cycle_kernel_lock()/d' fi Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
---|---|---|
.. | ||
agp | ||
hw_random | ||
ip2 | ||
ipmi | ||
mwave | ||
pcmcia | ||
rio | ||
tpm | ||
xilinx_hwicap | ||
.gitignore | ||
amiserial.c | ||
apm-emulation.c | ||
applicom.c | ||
applicom.h | ||
bfin_jtag_comm.c | ||
bfin-otp.c | ||
briq_panel.c | ||
bsr.c | ||
cd1865.h | ||
consolemap.c | ||
cp437.uni | ||
cs5535_gpio.c | ||
cyclades.c | ||
defkeymap.c_shipped | ||
defkeymap.map | ||
digi1.h | ||
digiFep1.h | ||
digiPCI.h | ||
ds1302.c | ||
ds1620.c | ||
dsp56k.c | ||
dtlk.c | ||
efirtc.c | ||
epca.c | ||
epca.h | ||
epcaconfig.h | ||
generic_nvram.c | ||
generic_serial.c | ||
genrtc.c | ||
hangcheck-timer.c | ||
hpet.c | ||
hvc_beat.c | ||
hvc_console.c | ||
hvc_console.h | ||
hvc_irq.c | ||
hvc_iseries.c | ||
hvc_iucv.c | ||
hvc_rtas.c | ||
hvc_tile.c | ||
hvc_udbg.c | ||
hvc_vio.c | ||
hvc_xen.c | ||
hvcs.c | ||
hvsi.c | ||
i8k.c | ||
isicom.c | ||
istallion.c | ||
Kconfig | ||
keyboard.c | ||
lp.c | ||
Makefile | ||
mbcs.c | ||
mbcs.h | ||
mem.c | ||
misc.c | ||
mmtimer.c | ||
moxa.c | ||
moxa.h | ||
mspec.c | ||
mxser.c | ||
mxser.h | ||
n_gsm.c | ||
n_hdlc.c | ||
n_r3964.c | ||
n_tty.c | ||
nozomi.c | ||
nsc_gpio.c | ||
nvram.c | ||
nwbutton.c | ||
nwbutton.h | ||
nwflash.c | ||
pc8736x_gpio.c | ||
ppdev.c | ||
ps3flash.c | ||
pty.c | ||
ramoops.c | ||
random.c | ||
raw.c | ||
riscom8_reg.h | ||
riscom8.c | ||
riscom8.h | ||
rocket_int.h | ||
rocket.c | ||
rocket.h | ||
rtc.c | ||
scc.h | ||
scx200_gpio.c | ||
selection.c | ||
ser_a2232.c | ||
ser_a2232.h | ||
ser_a2232fw.ax | ||
ser_a2232fw.h | ||
serial167.c | ||
snsc_event.c | ||
snsc.c | ||
snsc.h | ||
sonypi.c | ||
specialix_io8.h | ||
specialix.c | ||
stallion.c | ||
sx.c | ||
sx.h | ||
sxboards.h | ||
sxwindow.h | ||
synclink_gt.c | ||
synclink.c | ||
synclinkmp.c | ||
sysrq.c | ||
tb0219.c | ||
tlclk.c | ||
toshiba.c | ||
tty_audit.c | ||
tty_buffer.c | ||
tty_io.c | ||
tty_ioctl.c | ||
tty_ldisc.c | ||
tty_mutex.c | ||
tty_port.c | ||
uv_mmtimer.c | ||
vc_screen.c | ||
viotape.c | ||
virtio_console.c | ||
vme_scc.c | ||
vt_ioctl.c | ||
vt.c |