mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-07 06:52:07 +00:00
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: Nikanth Karthikesan <knikanth@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
f29192320f
commit
c68461b67d
1 changed files with 2 additions and 3 deletions
|
@ -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 = {
|
||||||
.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 = {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue