Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5704e44d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 

* 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
  BKL: introduce CONFIG_BKL.
  dabusb: remove the BKL
  sunrpc: remove the big kernel lock
  init/main.c: remove BKL notations
  blktrace: remove the big kernel lock
  rtmutex-tester: make it build without BKL
  dvb-core: kill the big kernel lock
  dvb/bt8xx: kill the big kernel lock
  tlclk: remove big kernel lock
  fix rawctl compat ioctls breakage on amd64 and itanic
  uml: kill big kernel lock
  parisc: remove big kernel lock
  cris: autoconvert trivial BKL users
  alpha: kill big kernel lock
  isapnp: BKL removal
  s390/block: kill the big kernel lock
  hpet: kill BKL, add compat_ioctl
parents 91151240 6de5bd12

arch/cris/arch-v10/drivers/ds1302.c

+4 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/module.h>

#include <linux/miscdevice.h>

#include <linux/delay.h>

#include <linux/smp_lock.h>

#include <linux/mutex.h>

#include <linux/bcd.h>

#include <linux/capability.h>
@@ -34,6 +34,7 @@ 


#define RTC_MAJOR_NR 121 /* local major, change later */



static DEFINE_MUTEX(ds1302_mutex);

static const char ds1302_name[] = "ds1302";



/* The DS1302 might be connected to different bits on different products.
@@ -357,9 +358,9 @@ static long rtc_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned lon 
{

	int ret;



	lock_kernel();

	mutex_lock(&ds1302_mutex);

	ret = rtc_ioctl(file, cmd, arg);

	unlock_kernel();

	mutex_unlock(&ds1302_mutex);



	return ret;

}

arch/cris/arch-v10/drivers/pcf8563.c

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/delay.h>

#include <linux/bcd.h>

#include <linux/mutex.h>

#include <linux/smp_lock.h>



#include <asm/uaccess.h>

#include <asm/system.h>
@@ -49,6 +48,7 @@ 
#define rtc_read(x) i2c_readreg(RTC_I2C_READ, x)

#define rtc_write(x,y) i2c_writereg(RTC_I2C_WRITE, x, y)



static DEFINE_MUTEX(pcf8563_mutex);

static DEFINE_MUTEX(rtc_lock); /* Protect state etc */



static const unsigned char days_in_month[] =
@@ -343,9 +343,9 @@ static long pcf8563_unlocked_ioctl(struct file *filp, unsigned int cmd, unsigned 
{

	int ret;



	lock_kernel();

	mutex_lock(&pcf8563_mutex);

	return pcf8563_ioctl(filp, cmd, arg);

	unlock_kernel();

	mutex_unlock(&pcf8563_mutex);



	return ret;

}

arch/cris/arch-v10/drivers/sync_serial.c

+6 −5
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/interrupt.h>

#include <linux/poll.h>

#include <linux/init.h>

#include <linux/smp_lock.h>

#include <linux/mutex.h>

#include <linux/timer.h>

#include <asm/irq.h>

#include <asm/dma.h>
@@ -149,6 +149,7 @@ struct sync_port { 
};





static DEFINE_MUTEX(sync_serial_mutex);

static int etrax_sync_serial_init(void);

static void initialize_port(int portnbr);

static inline int sync_data_avail(struct sync_port *port);
@@ -445,7 +446,7 @@ static int sync_serial_open(struct inode *inode, struct file *file) 
	int mode;

	int err = -EBUSY;



	lock_kernel();

	mutex_lock(&sync_serial_mutex);

	DEBUG(printk(KERN_DEBUG "Open sync serial port %d\n", dev));



	if (dev < 0 || dev >= NUMBER_OF_PORTS || !ports[dev].enabled) {
@@ -626,7 +627,7 @@ static int sync_serial_open(struct inode *inode, struct file *file) 
	ret = 0;

	

out:

	unlock_kernel();

	mutex_unlock(&sync_serial_mutex);

	return ret;

}
@@ -961,9 +962,9 @@ static long sync_serial_ioctl(struct file *file, 
{

	long ret;



	lock_kernel();

	mutex_lock(&sync_serial_mutex);

	ret = sync_serial_ioctl_unlocked(file, cmd, arg);

	unlock_kernel();

	mutex_unlock(&sync_serial_mutex);



	return ret;

}

arch/cris/arch-v32/drivers/cryptocop.c

+2 −2
Original line number Diff line number Diff line
@@ -3139,9 +3139,9 @@ cryptocop_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
       struct inode *inode = file->f_path.dentry->d_inode;

       long ret;



       lock_kernel();

       mutex_lock(&cryptocop_mutex);

       ret = cryptocop_ioctl_unlocked(inode, filp, cmd, arg);

       unlock_kernel();

       mutex_unlock(&cryptocop_mutex);



       return ret;

}

arch/cris/arch-v32/drivers/mach-a3/gpio.c

+6 −5
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/spinlock.h>

#include <linux/smp_lock.h>

#include <linux/mutex.h>



#include <asm/etraxgpio.h>

#include <hwregs/reg_map.h>
@@ -66,6 +66,7 @@ static int dp_cnt; 
#define DP(x)

#endif



static DEFINE_MUTEX(gpio_mutex);

static char gpio_name[] = "etrax gpio";



#ifdef CONFIG_ETRAX_VIRTUAL_GPIO
@@ -391,7 +392,7 @@ static int gpio_open(struct inode *inode, struct file *filp) 
	if (!priv)

		return -ENOMEM;



	lock_kernel();

	mutex_lock(&gpio_mutex);

	memset(priv, 0, sizeof(*priv));



	priv->minor = p;
@@ -414,7 +415,7 @@ static int gpio_open(struct inode *inode, struct file *filp) 
		spin_unlock_irq(&gpio_lock);

	}



	unlock_kernel();

	mutex_unlock(&gpio_mutex);

	return 0;

}
@@ -667,9 +668,9 @@ static long gpio_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
{

       long ret;



       lock_kernel();

       mutex_lock(&gpio_mutex);

       ret = gpio_ioctl_unlocked(file, cmd, arg);

       unlock_kernel();

       mutex_unlock(&gpio_mutex);



       return ret;

}