Merge tag 'compat-ioctl-fix' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd...

[linux.git] / arch / um / drivers / mconsole_kern.c

diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 0117489e9b30a8560d4bef26685f3732f2ffb8cf..b80a1d616e4ea5b7a21151e29ea5c740ba3faac1 100644 (file)
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -752,10 +752,9 @@ static ssize_t mconsole_proc_write(struct file *file,
        return count;
 }
 
-static const struct file_operations mconsole_proc_fops = {
-       .owner          = THIS_MODULE,
-       .write          = mconsole_proc_write,
-       .llseek         = noop_llseek,
+static const struct proc_ops mconsole_proc_ops = {
+       .proc_write     = mconsole_proc_write,
+       .proc_lseek     = noop_llseek,
 };
 
 static int create_proc_mconsole(void)
@@ -765,7 +764,7 @@ static int create_proc_mconsole(void)
        if (notify_socket == NULL)
                return 0;
 
-       ent = proc_create("mconsole", 0200, NULL, &mconsole_proc_fops);
+       ent = proc_create("mconsole", 0200, NULL, &mconsole_proc_ops);
        if (ent == NULL) {
                printk(KERN_INFO "create_proc_mconsole : proc_create failed\n");
                return 0;