diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 10:45:01 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 10:45:01 +0900 |
| commit | d96d8aa261708ecb1536d2733081800e7e15e8f4 (patch) | |
| tree | 97192bfa31f7fb6784a2e42c2fae6b705764be2b /arch/x86/kernel | |
| parent | 54e11304e88406928193cec8218f1003fd92ba16 (diff) | |
| parent | 122498738417c73943b71294c60ec34fc110f5d6 (diff) | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar:
"Two small cleanups"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, msr: Use file_inode(), not f_mapping->host
x86: mkpiggy.c: Explicitly close the output file
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/msr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c index 88458faea2f..05266b5aae2 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c @@ -46,7 +46,7 @@ static struct class *msr_class; static loff_t msr_seek(struct file *file, loff_t offset, int orig) { loff_t ret; - struct inode *inode = file->f_mapping->host; + struct inode *inode = file_inode(file); mutex_lock(&inode->i_mutex); switch (orig) { |