adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-30 20:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86: cdev lock_kernel() pushdown

Browse source 
Push the cdev lock_kernel() call down into the x86 msr and cpuid drivers.

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet 2008-05-15 09:12:01 -06:00
parent 1fa984b583
commit 5119e92efc
2 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
arch/x86/kernel/cpuid.c
View file

@ -33,6 +33,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/smp_lock.h>
#include <linux/major.h> #include <linux/major.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
@ -107,15 +108,23 @@ static ssize_t cpuid_read(struct file *file, char __user *buf,
static int cpuid_open(struct inode *inode, struct file *file) static int cpuid_open(struct inode *inode, struct file *file)
{ {
unsigned int cpu = iminor(file->f_path.dentry->d_inode); unsigned int cpu;
struct cpuinfo_x86 *c = &cpu_data(cpu); struct cpuinfo_x86 *c;
int ret = 0;
lock_kernel();
if (cpu >= NR_CPUS || !cpu_online(cpu)) cpu = iminor(file->f_path.dentry->d_inode);
return -ENXIO; /* No such CPU */ if (cpu >= NR_CPUS || !cpu_online(cpu)) {
ret = -ENXIO; /* No such CPU */
goto out;
}
c = &cpu_data(cpu);
if (c->cpuid_level < 0) if (c->cpuid_level < 0)
return -EIO; /* CPUID not supported */ ret = -EIO; /* CPUID not supported */
out:
return 0; unlock_kernel();
return ret;
} }
/* /*

16
arch/x86/kernel/msr.c
View file

@ -117,12 +117,20 @@ static int msr_open(struct inode *inode, struct file *file)
{ {
unsigned int cpu = iminor(file->f_path.dentry->d_inode); unsigned int cpu = iminor(file->f_path.dentry->d_inode);
struct cpuinfo_x86 *c = &cpu_data(cpu); struct cpuinfo_x86 *c = &cpu_data(cpu);
int ret = 0;
if (cpu >= NR_CPUS || !cpu_online(cpu)) lock_kernel();
return -ENXIO; /* No such CPU */ cpu = iminor(file->f_path.dentry->d_inode);
if (cpu >= NR_CPUS || !cpu_online(cpu)) {
ret = -ENXIO; /* No such CPU */
goto out;
}
c = &cpu_data(cpu);
if (!cpu_has(c, X86_FEATURE_MSR)) if (!cpu_has(c, X86_FEATURE_MSR))
return -EIO; /* MSR not supported */ ret = -EIO; /* MSR not supported */
out:
unlock_kernel();
return 0; return 0;
} }