diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 16:17:17 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 16:17:17 (GMT) |
| commit | d6f3875252bb703a9a3de0b92f7ae154f12c986c (patch) | |
| tree | d89d745f08f467d0e197056fa956ddc701574d38 /arch/x86/kernel/microcode_core.c | |
| parent | cb41838bbc4403f7270a94b93a9a0d9fc9c2e7ea (diff) | |
| parent | 3f10940e4fb69d312602078f2c5234206797ca31 (diff) | |
| download | linux-d6f3875252bb703a9a3de0b92f7ae154f12c986c.tar.xz | |
Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86/microcode: Use nonseekable_open()
x86: Improve Intel microcode loader performance
Diffstat (limited to 'arch/x86/kernel/microcode_core.c')
| -rw-r--r-- | 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, |