lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86-mce: BKL pushdown

Browse Source 
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2008-05-20 19:17:02 +02:00
committed by Jonathan Corbet
parent 3e0420f066
commit 38c4c97c62
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/cpu/mcheck/mce_64.c
View File

@@ -9,6 +9,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/smp_lock.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
@@ -527,10 +528,12 @@ static int open_exclu; /* already open exclusive? */
static int mce_open(struct inode *inode, struct file *file) static int mce_open(struct inode *inode, struct file *file)
{ {
lock_kernel();
spin_lock(&mce_state_lock); spin_lock(&mce_state_lock);
if (open_exclu || (open_count && (file->f_flags & O_EXCL))) { if (open_exclu || (open_count && (file->f_flags & O_EXCL))) {
spin_unlock(&mce_state_lock); spin_unlock(&mce_state_lock);
unlock_kernel();
return -EBUSY; return -EBUSY;
} }
@@ -539,6 +542,7 @@ static int mce_open(struct inode *inode, struct file *file)
open_count++; open_count++;
spin_unlock(&mce_state_lock); spin_unlock(&mce_state_lock);
unlock_kernel();
return nonseekable_open(inode, file); return nonseekable_open(inode, file);
} }