Commit 1114b684 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Frederic Weisbecker
Browse files

sn_hwperf: Kill BKL usage 



This driver always gave up the BKL in its ioctl function, so just
convert it to unlocked_ioctl and remove the BKL here.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
parent 7cc4bcc6

arch/ia64/sn/kernel/sn2/sn_hwperf.c

+2 −7
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/miscdevice.h>

#include <linux/utsname.h>

#include <linux/cpumask.h>

#include <linux/smp_lock.h>

#include <linux/nodemask.h>

#include <linux/smp.h>

#include <linux/mutex.h>
@@ -682,8 +681,7 @@ static int sn_hwperf_map_err(int hwperf_err) 
/*

 * ioctl for "sn_hwperf" misc device

 */

static int

sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, unsigned long arg)

static long sn_hwperf_ioctl(struct file *fp, u32 op, unsigned long arg)

{

	struct sn_hwperf_ioctl_args a;

	struct cpuinfo_ia64 *cdata;
@@ -699,8 +697,6 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, unsigned long arg) 
	int i;

	int j;



	unlock_kernel();



	/* only user requests are allowed here */

	if ((op & SN_HWPERF_OP_MASK) < 10) {

		r = -EINVAL;
@@ -859,12 +855,11 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, unsigned long arg) 
error:

	vfree(p);



	lock_kernel();

	return r;

}



static const struct file_operations sn_hwperf_fops = {

	.ioctl = sn_hwperf_ioctl,

	.unlocked_ioctl = sn_hwperf_ioctl,

};



static struct miscdevice sn_hwperf_dev = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE