[tip:x86/microcode] x86/microcode: Use nonseekable_open()
in [Kernel]
|
Prev: [PATCH v2] change alloc function in __vmalloc_area_node
Next: [PATCH v2] change alloc function in vmemmap_alloc_block
From: tip-bot for Arnd Bergmann on 14 Apr 2010 11:10 Commit-ID: 3f10940e4fb69d312602078f2c5234206797ca31 Gitweb: http://git.kernel.org/tip/3f10940e4fb69d312602078f2c5234206797ca31 Author: Arnd Bergmann <arnd(a)relay.de.ibm.com> AuthorDate: Sat, 10 Apr 2010 16:46:21 +0200 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Wed, 14 Apr 2010 12:27:34 +0200 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(a)arndb.de> [drop useless llseek = no_llseek and smp_lock.h inclusion] Signed-off-by: Frederic Weisbecker <fweisbec(a)gmail.com> Cc: Arnd Bergmann <arnd(a)relay.de.ibm.com> Cc: H. Peter Anvin <hpa(a)zytor.com> Cc: Dmitry Adamushko <dmitry.adamushko(a)gmail.com> LKML-Reference: <1270910781-8786-1-git-send-regression-fweisbec(a)gmail.com> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- arch/x86/kernel/microcode_core.c | 4 ++-- 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, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |