git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into percpu-cpumask-x86-for-linus-2
[safe/jmp/linux-2.6]
/
arch
/
x86
/
kernel
/
cpuid.c
diff --git
a/arch/x86/kernel/cpuid.c
b/arch/x86/kernel/cpuid.c
index
6a44d64
..
2ac1f0c
100644
(file)
--- a/
arch/x86/kernel/cpuid.c
+++ b/
arch/x86/kernel/cpuid.c
@@
-39,10
+39,10
@@
#include <linux/device.h>
#include <linux/cpu.h>
#include <linux/notifier.h>
#include <linux/device.h>
#include <linux/cpu.h>
#include <linux/notifier.h>
+#include <linux/uaccess.h>
#include <asm/processor.h>
#include <asm/msr.h>
#include <asm/processor.h>
#include <asm/msr.h>
-#include <asm/uaccess.h>
#include <asm/system.h>
static struct class *cpuid_class;
#include <asm/system.h>
static struct class *cpuid_class;
@@
-82,7
+82,7
@@
static loff_t cpuid_seek(struct file *file, loff_t offset, int orig)
}
static ssize_t cpuid_read(struct file *file, char __user *buf,
}
static ssize_t cpuid_read(struct file *file, char __user *buf,
- size_t count, loff_t *
ppos)
+ size_t count, loff_t *ppos)
{
char __user *tmp = buf;
struct cpuid_regs cmd;
{
char __user *tmp = buf;
struct cpuid_regs cmd;
@@
-117,11
+117,11
@@
static int cpuid_open(struct inode *inode, struct file *file)
unsigned int cpu;
struct cpuinfo_x86 *c;
int ret = 0;
unsigned int cpu;
struct cpuinfo_x86 *c;
int ret = 0;
-
+
lock_kernel();
cpu = iminor(file->f_path.dentry->d_inode);
lock_kernel();
cpu = iminor(file->f_path.dentry->d_inode);
- if (cpu >=
NR_CPUS
|| !cpu_online(cpu)) {
+ if (cpu >=
nr_cpu_ids
|| !cpu_online(cpu)) {
ret = -ENXIO; /* No such CPU */
goto out;
}
ret = -ENXIO; /* No such CPU */
goto out;
}
@@
-147,8
+147,8
@@
static __cpuinit int cpuid_device_create(int cpu)
{
struct device *dev;
{
struct device *dev;
- dev = device_create
_drvdata(cpuid_class, NULL, MKDEV(CPUID_MAJOR, cpu)
,
-
NULL,
"cpu%d", cpu);
+ dev = device_create
(cpuid_class, NULL, MKDEV(CPUID_MAJOR, cpu), NULL
,
+ "cpu%d", cpu);
return IS_ERR(dev) ? PTR_ERR(dev) : 0;
}
return IS_ERR(dev) ? PTR_ERR(dev) : 0;
}