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

Commit ba58aebf authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Tony Luck
Browse files

[IA64] perfmon: convert to unlocked_ioctl 



The ioctl function in this driver does not
do anything that requires the BKL, so make
it use unlocked_ioctl.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 7b313fdf

arch/ia64/kernel/perfmon.c

+11 −11
Original line number Diff line number Diff line
@@ -1696,8 +1696,8 @@ pfm_poll(struct file *filp, poll_table * wait) 
	return mask;

}



static int

pfm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)

static long

pfm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

	DPRINT(("pfm_ioctl called\n"));

	return -EINVAL;
@@ -2178,7 +2178,7 @@ static const struct file_operations pfm_file_ops = { 
	.read		= pfm_read,

	.write		= pfm_write,

	.poll		= pfm_poll,

	.ioctl    = pfm_ioctl,

	.unlocked_ioctl = pfm_ioctl,

	.open		= pfm_no_open,	/* special open code to disallow open via /proc */

	.fasync		= pfm_fasync,

	.release	= pfm_close,