diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-07-04 00:15:05 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2010-07-06 11:38:59 -0700 |
| commit | ba58aebf567d2cb45ed9dbbb6910b51144f20c68 (patch) | |
| tree | 570149a5f182bea98e1f81581d8555761b076a0d /arch/ia64 | |
| parent | 7b313fdf2303ddfaea6ae1aad09fb3ccdb884bcc (diff) | |
| download | kernel_samsung_crespo-ba58aebf567d2cb45ed9dbbb6910b51144f20c68.zip kernel_samsung_crespo-ba58aebf567d2cb45ed9dbbb6910b51144f20c68.tar.gz kernel_samsung_crespo-ba58aebf567d2cb45ed9dbbb6910b51144f20c68.tar.bz2 | |
[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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/perfmon.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index ab985f7..7443290 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c @@ -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; @@ -2174,15 +2174,15 @@ pfm_no_open(struct inode *irrelevant, struct file *dontcare) static const struct file_operations pfm_file_ops = { - .llseek = no_llseek, - .read = pfm_read, - .write = pfm_write, - .poll = pfm_poll, - .ioctl = pfm_ioctl, - .open = pfm_no_open, /* special open code to disallow open via /proc */ - .fasync = pfm_fasync, - .release = pfm_close, - .flush = pfm_flush + .llseek = no_llseek, + .read = pfm_read, + .write = pfm_write, + .poll = pfm_poll, + .unlocked_ioctl = pfm_ioctl, + .open = pfm_no_open, /* special open code to disallow open via /proc */ + .fasync = pfm_fasync, + .release = pfm_close, + .flush = pfm_flush }; static int |