From 289b9ec0386a97f3129813c5914edddc6b97092a Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Sat, 10 Apr 2010 16:46:21 +0200 Subject: [PATCH] --- yaml --- r: 191535 b: refs/heads/master c: 3f10940e4fb69d312602078f2c5234206797ca31 h: refs/heads/master i: 191533: c585f5ff5e30d32e7df94b8b7b405cff7189d98a 191531: 8d9107be3302061434072eee2c6934d2286bbf02 191527: 28a2c948df904fc65857586cdbb4d23c76fc5acb 191519: 759113a9b44b120de4cae132c60c583ac3caa7e9 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/microcode_core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fa798c16f924..512f6614bd80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 938179b4f8cf8a4f11234ebf2dff2eb48400acfe +refs/heads/master: 3f10940e4fb69d312602078f2c5234206797ca31 diff --git a/trunk/arch/x86/kernel/microcode_core.c b/trunk/arch/x86/kernel/microcode_core.c index cceb5bc3c3c2..2cd8c544e41a 100644 --- a/trunk/arch/x86/kernel/microcode_core.c +++ b/trunk/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,