From 282bb92306ceaf390fc4e43f7a9ef0dfeb80a90a Mon Sep 17 00:00:00 2001
From: Nikanth Karthikesan <knikanth@suse.de>
Date: Wed, 30 Jan 2008 13:32:59 +0100
Subject: [PATCH] --- yaml --- r: 80229 b: refs/heads/master c:
 c68461b67d97739707b3fc57618f22091791f2af h: refs/heads/master i:   80227:
 e979d35e1eb3f04d085d9d282a7c6ad5a165ea4a v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/x86/kernel/cpu/mcheck/mce_64.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 683e0ca2888f..bb10f498a125 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f29192320f22f1617d50a9c790862603eeef64e6
+refs/heads/master: c68461b67d97739707b3fc57618f22091791f2af
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c
index bc6e35153d83..98b23d55fe6e 100644
--- a/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -634,8 +634,7 @@ static unsigned int mce_poll(struct file *file, poll_table *wait)
 	return 0;
 }
 
-static int mce_ioctl(struct inode *i, struct file *f,unsigned int cmd,
-		     unsigned long arg)
+static long mce_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
 {
 	int __user *p = (int __user *)arg;
 
@@ -664,7 +663,7 @@ static const struct file_operations mce_chrdev_ops = {
 	.release = mce_release,
 	.read = mce_read,
 	.poll = mce_poll,
-	.ioctl = mce_ioctl,
+	.unlocked_ioctl = mce_ioctl,
 };
 
 static struct miscdevice mce_log_device = {