diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-12-14 19:02:18 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-14 19:05:05 +0100 |
| commit | 494c2ebfb287eb10b229415063099e3700639028 (patch) | |
| tree | ac55499ae26219e6c4eaad3b73fd143104048d65 /arch/x86/kernel/msr.c | |
| parent | x86, mce: Clean up thermal init by introducing intel_thermal_supported() (diff) | |
| download | linux-494c2ebfb287eb10b229415063099e3700639028.tar.xz linux-494c2ebfb287eb10b229415063099e3700639028.zip | |
x86, msr: Remove incorrect, duplicated code in the MSR driver
The MSR driver would compute the values for cpu and c at declaration,
and then again in the body of the function. This isn't merely
redundant, but unsafe, since cpu might not refer to a valid CPU at
that point.
Remove the unnecessary and dangerous references in the declarations.
This code now matches the equivalent code in the CPUID driver.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/msr.c')
| -rw-r--r-- | arch/x86/kernel/msr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c index 553449951b84..572b07eee3f4 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c @@ -172,11 +172,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg) static int msr_open(struct inode *inode, struct file *file) { - unsigned int cpu = iminor(file->f_path.dentry->d_inode); - struct cpuinfo_x86 *c = &cpu_data(cpu); + unsigned int cpu; + struct cpuinfo_x86 *c; cpu = iminor(file->f_path.dentry->d_inode); - if (cpu >= nr_cpu_ids || !cpu_online(cpu)) return -ENXIO; /* No such CPU */ |