diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2008-05-20 19:17:02 +0200 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-02 15:06:26 -0600 |
| commit | 38c4c97c62a30aef276663c1128a2051a25ead7d (patch) | |
| tree | df839c451aae68b43e280aa2c894206cd1e50d02 /arch/x86/kernel/cpu/mcheck | |
| parent | 3e0420f066c632e135939ccf218ae793e02dccd7 (diff) | |
| download | kernel-crypto-38c4c97c62a30aef276663c1128a2051a25ead7d.tar.gz kernel-crypto-38c4c97c62a30aef276663c1128a2051a25ead7d.tar.xz kernel-crypto-38c4c97c62a30aef276663c1128a2051a25ead7d.zip | |
x86-mce: BKL pushdown
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce_64.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c index e07e8c068ae..4ef151633e8 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_64.c @@ -9,6 +9,7 @@ #include <linux/types.h> #include <linux/kernel.h> #include <linux/sched.h> +#include <linux/smp_lock.h> #include <linux/string.h> #include <linux/rcupdate.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) { + lock_kernel(); spin_lock(&mce_state_lock); if (open_exclu || (open_count && (file->f_flags & O_EXCL))) { spin_unlock(&mce_state_lock); + unlock_kernel(); return -EBUSY; } @@ -539,6 +542,7 @@ static int mce_open(struct inode *inode, struct file *file) open_count++; spin_unlock(&mce_state_lock); + unlock_kernel(); return nonseekable_open(inode, file); } |