Commit:     c68461b67d97739707b3fc57618f22091791f2af
Parent:     f29192320f22f1617d50a9c790862603eeef64e6
Author:     Nikanth Karthikesan <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:32:59 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:32:59 2008 +0100

    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 <[EMAIL PROTECTED]>
    Change the Machine check handler to use unlocked_ioctl instead of
    ioctl handler. Also the mce ioctl handler does not need any lock
    Signed-off-by: Nikanth Karthikesan <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
 arch/x86/kernel/cpu/mcheck/mce_64.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c 
index bc6e351..98b23d5 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -634,8 +634,7 @@ static unsigned int mce_poll(struct file *file, poll_table 
        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 = {
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to