Commit c68461b6 authored by Nikanth Karthikesan's avatar Nikanth Karthikesan Committed by Ingo Molnar

x86: change x86 machine check handler to use unlocked_ioctl instead

The machine check handler registers ioctl handler that is called
with the BKL held. Changing to register unlocked_ioctl instead.
Also mce ioctl handler does not seem to need any lock protection.

To: Andi Kleen <andi@firstfloor.org>
Cc: linux-kernel@vger.kernel.org
Cc: kernel-janitors@vger.kernel.org

Change the Machine check handler to use unlocked_ioctl instead of
ioctl handler. Also the mce ioctl handler does not need any lock
protection.
Signed-off-by: default avatarNikanth Karthikesan <knikanth@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent f2919232
...@@ -634,8 +634,7 @@ static unsigned int mce_poll(struct file *file, poll_table *wait) ...@@ -634,8 +634,7 @@ static unsigned int mce_poll(struct file *file, poll_table *wait)
return 0; return 0;
} }
static int mce_ioctl(struct inode *i, struct file *f,unsigned int cmd, static long mce_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
unsigned long arg)
{ {
int __user *p = (int __user *)arg; int __user *p = (int __user *)arg;
...@@ -664,7 +663,7 @@ static const struct file_operations mce_chrdev_ops = { ...@@ -664,7 +663,7 @@ static const struct file_operations mce_chrdev_ops = {
.release = mce_release, .release = mce_release,
.read = mce_read, .read = mce_read,
.poll = mce_poll, .poll = mce_poll,
.ioctl = mce_ioctl, .unlocked_ioctl = mce_ioctl,
}; };
static struct miscdevice mce_log_device = { static struct miscdevice mce_log_device = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment