projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
[linux-2.6-block.git]
/
drivers
/
isdn
/
divert
/
divert_procfs.c
diff --git
a/drivers/isdn/divert/divert_procfs.c
b/drivers/isdn/divert/divert_procfs.c
index 3697c409bec66d5b9c2dbe0b31577f22fef2ef1c..c53e2417e7d4aca7130160d27dbf4b32815c1e1d 100644
(file)
--- a/
drivers/isdn/divert/divert_procfs.c
+++ b/
drivers/isdn/divert/divert_procfs.c
@@
-11,6
+11,7
@@
#include <linux/module.h>
#include <linux/poll.h>
#include <linux/module.h>
#include <linux/poll.h>
+#include <linux/slab.h>
#ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
#else
#ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
#else
@@
-19,6
+20,7
@@
#include <linux/sched.h>
#include <linux/isdnif.h>
#include <net/net_namespace.h>
#include <linux/sched.h>
#include <linux/isdnif.h>
#include <net/net_namespace.h>
+#include <linux/smp_lock.h>
#include "isdn_divert.h"
#include "isdn_divert.h"
@@
-176,9
+178,7
@@
isdn_divert_close(struct inode *ino, struct file *filep)
/*********/
/* IOCTL */
/*********/
/*********/
/* IOCTL */
/*********/
-static int
-isdn_divert_ioctl(struct inode *inode, struct file *file,
- uint cmd, ulong arg)
+static int isdn_divert_ioctl_unlocked(struct file *file, uint cmd, ulong arg)
{
divert_ioctl dioctl;
int i;
{
divert_ioctl dioctl;
int i;
@@
-257,6
+257,17
@@
isdn_divert_ioctl(struct inode *inode, struct file *file,
return copy_to_user((void __user *)arg, &dioctl, sizeof(dioctl)) ? -EFAULT : 0;
} /* isdn_divert_ioctl */
return copy_to_user((void __user *)arg, &dioctl, sizeof(dioctl)) ? -EFAULT : 0;
} /* isdn_divert_ioctl */
+static long isdn_divert_ioctl(struct file *file, uint cmd, ulong arg)
+{
+ long ret;
+
+ lock_kernel();
+ ret = isdn_divert_ioctl_unlocked(file, cmd, arg);
+ unlock_kernel();
+
+ return ret;
+}
+
static const struct file_operations isdn_fops =
{
.owner = THIS_MODULE,
static const struct file_operations isdn_fops =
{
.owner = THIS_MODULE,
@@
-264,7
+275,7
@@
static const struct file_operations isdn_fops =
.read = isdn_divert_read,
.write = isdn_divert_write,
.poll = isdn_divert_poll,
.read = isdn_divert_read,
.write = isdn_divert_write,
.poll = isdn_divert_poll,
- .
ioctl
= isdn_divert_ioctl,
+ .
unlocked_ioctl
= isdn_divert_ioctl,
.open = isdn_divert_open,
.release = isdn_divert_close,
};
.open = isdn_divert_open,
.release = isdn_divert_close,
};