summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@relay.de.ibm.com>2010-04-10 16:46:21 +0200
committerIngo Molnar <mingo@elte.hu>2010-04-14 12:27:34 +0200
commit3f10940e4fb69d312602078f2c5234206797ca31 (patch)
tree20c2b056639b9d2e01a527851c38663d4d28a5e3
parent938179b4f8cf8a4f11234ebf2dff2eb48400acfe (diff)
downloadop-kernel-dev-3f10940e4fb69d312602078f2c5234206797ca31.zip
op-kernel-dev-3f10940e4fb69d312602078f2c5234206797ca31.tar.gz
x86/microcode: Use nonseekable_open()
No need to seek on this file, so prevent it outright so we can avoid using default_llseek - removes one more BKL usage. Signed-off-by: Arnd Bergmann <arnd@arndb.de> [drop useless llseek = no_llseek and smp_lock.h inclusion] Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Arnd Bergmann <arnd@relay.de.ibm.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Dmitry Adamushko <dmitry.adamushko@gmail.com> LKML-Reference: <1270910781-8786-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/microcode_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
index cceb5bc..2cd8c54 100644
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -201,9 +201,9 @@ static int do_microcode_update(const void __user *buf, size_t size)
return error;
}
-static int microcode_open(struct inode *unused1, struct file *unused2)
+static int microcode_open(struct inode *inode, struct file *file)
{
- return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;
+ return capable(CAP_SYS_RAWIO) ? nonseekable_open(inode, file) : -EPERM;
}
static ssize_t microcode_write(struct file *file, const char __user *buf,
OpenPOWER on IntegriCloud