git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
drivers
/
macintosh
/
via-pmu.c
diff --git
a/drivers/macintosh/via-pmu.c
b/drivers/macintosh/via-pmu.c
index
4276484
..
3d4fc0f
100644
(file)
--- a/
drivers/macintosh/via-pmu.c
+++ b/
drivers/macintosh/via-pmu.c
@@
-2273,8
+2273,7
@@
static int register_pmu_pm_ops(void)
device_initcall(register_pmu_pm_ops);
#endif
device_initcall(register_pmu_pm_ops);
#endif
-static int
-pmu_ioctl(struct inode * inode, struct file *filp,
+static int pmu_ioctl(struct file *filp,
u_int cmd, u_long arg)
{
__u32 __user *argp = (__u32 __user *)arg;
u_int cmd, u_long arg)
{
__u32 __user *argp = (__u32 __user *)arg;
@@
-2337,11
+2336,23
@@
pmu_ioctl(struct inode * inode, struct file *filp,
return error;
}
return error;
}
+static long pmu_unlocked_ioctl(struct file *filp,
+ u_int cmd, u_long arg)
+{
+ int ret;
+
+ lock_kernel();
+ ret = pmu_ioctl(filp, cmd, arg);
+ unlock_kernel();
+
+ return ret;
+}
+
static const struct file_operations pmu_device_fops = {
.read = pmu_read,
.write = pmu_write,
.poll = pmu_fpoll,
static const struct file_operations pmu_device_fops = {
.read = pmu_read,
.write = pmu_write,
.poll = pmu_fpoll,
- .
ioctl = pmu
_ioctl,
+ .
unlocked_ioctl = pmu_unlocked
_ioctl,
.open = pmu_open,
.release = pmu_release,
};
.open = pmu_open,
.release = pmu_release,
};