diff options
author | Arnd Bergmann <arnd@arndb.de> | 2010-07-03 18:15:05 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2010-07-06 14:38:59 -0400 |
commit | ba58aebf567d2cb45ed9dbbb6910b51144f20c68 (patch) | |
tree | 570149a5f182bea98e1f81581d8555761b076a0d /arch/ia64 | |
parent | 7b313fdf2303ddfaea6ae1aad09fb3ccdb884bcc (diff) |
[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 ab985f785c14..744329072f33 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) | |||
1696 | return mask; | 1696 | return mask; |
1697 | } | 1697 | } |
1698 | 1698 | ||
1699 | static int | 1699 | static long |
1700 | pfm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) | 1700 | pfm_ioctl(struct file *file, unsigned int cmd, unsigned long arg) |
1701 | { | 1701 | { |
1702 | DPRINT(("pfm_ioctl called\n")); | 1702 | DPRINT(("pfm_ioctl called\n")); |
1703 | return -EINVAL; | 1703 | return -EINVAL; |
@@ -2174,15 +2174,15 @@ pfm_no_open(struct inode *irrelevant, struct file *dontcare) | |||
2174 | 2174 | ||
2175 | 2175 | ||
2176 | static const struct file_operations pfm_file_ops = { | 2176 | static const struct file_operations pfm_file_ops = { |
2177 | .llseek = no_llseek, | 2177 | .llseek = no_llseek, |
2178 | .read = pfm_read, | 2178 | .read = pfm_read, |
2179 | .write = pfm_write, | 2179 | .write = pfm_write, |
2180 | .poll = pfm_poll, | 2180 | .poll = pfm_poll, |
2181 | .ioctl = pfm_ioctl, | 2181 | .unlocked_ioctl = pfm_ioctl, |
2182 | .open = pfm_no_open, /* special open code to disallow open via /proc */ | 2182 | .open = pfm_no_open, /* special open code to disallow open via /proc */ |
2183 | .fasync = pfm_fasync, | 2183 | .fasync = pfm_fasync, |
2184 | .release = pfm_close, | 2184 | .release = pfm_close, |
2185 | .flush = pfm_flush | 2185 | .flush = pfm_flush |
2186 | }; | 2186 | }; |
2187 | 2187 | ||
2188 | static int | 2188 | static int |