git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
cpuid.c
diff --git
a/arch/i386/kernel/cpuid.c
b/arch/i386/kernel/cpuid.c
index
2e27563
..
1d9a4ab
100644
(file)
--- a/
arch/i386/kernel/cpuid.c
+++ b/
arch/i386/kernel/cpuid.c
@@
-45,7
+45,7
@@
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/system.h>
-static struct class
_simple
*cpuid_class;
+static struct class *cpuid_class;
#ifdef CONFIG_SMP
#ifdef CONFIG_SMP
@@
-117,14
+117,13
@@
static ssize_t cpuid_read(struct file *file, char __user *buf,
{
char __user *tmp = buf;
u32 data[4];
{
char __user *tmp = buf;
u32 data[4];
- size_t rv;
u32 reg = *ppos;
int cpu = iminor(file->f_dentry->d_inode);
if (count % 16)
return -EINVAL; /* Invalid chunk size */
u32 reg = *ppos;
int cpu = iminor(file->f_dentry->d_inode);
if (count % 16)
return -EINVAL; /* Invalid chunk size */
- for (
rv = 0
; count; count -= 16) {
+ for (; count; count -= 16) {
do_cpuid(cpu, reg, data);
if (copy_to_user(tmp, &data, 16))
return -EFAULT;
do_cpuid(cpu, reg, data);
if (copy_to_user(tmp, &data, 16))
return -EFAULT;
@@
-158,27
+157,27
@@
static struct file_operations cpuid_fops = {
.open = cpuid_open,
};
.open = cpuid_open,
};
-static int cpuid_class_
simple_device_add(int i)
+static int cpuid_class_
device_create(int i)
{
int err = 0;
struct class_device *class_err;
{
int err = 0;
struct class_device *class_err;
- class_err = class_
simple_device_add(cpuid_class
, MKDEV(CPUID_MAJOR, i), NULL, "cpu%d",i);
+ class_err = class_
device_create(cpuid_class, NULL
, MKDEV(CPUID_MAJOR, i), NULL, "cpu%d",i);
if (IS_ERR(class_err))
err = PTR_ERR(class_err);
return err;
}
if (IS_ERR(class_err))
err = PTR_ERR(class_err);
return err;
}
-static int
__devinit
cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
+static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
switch (action) {
case CPU_ONLINE:
{
unsigned int cpu = (unsigned long)hcpu;
switch (action) {
case CPU_ONLINE:
- cpuid_class_
simple_device_add
(cpu);
+ cpuid_class_
device_create
(cpu);
break;
case CPU_DEAD:
break;
case CPU_DEAD:
- class_
simple_device_remove(
MKDEV(CPUID_MAJOR, cpu));
+ class_
device_destroy(cpuid_class,
MKDEV(CPUID_MAJOR, cpu));
break;
}
return NOTIFY_OK;
break;
}
return NOTIFY_OK;
@@
-200,13
+199,13
@@
static int __init cpuid_init(void)
err = -EBUSY;
goto out;
}
err = -EBUSY;
goto out;
}
- cpuid_class = class_
simple_
create(THIS_MODULE, "cpuid");
+ cpuid_class = class_create(THIS_MODULE, "cpuid");
if (IS_ERR(cpuid_class)) {
err = PTR_ERR(cpuid_class);
goto out_chrdev;
}
for_each_online_cpu(i) {
if (IS_ERR(cpuid_class)) {
err = PTR_ERR(cpuid_class);
goto out_chrdev;
}
for_each_online_cpu(i) {
- err = cpuid_class_
simple_device_add
(i);
+ err = cpuid_class_
device_create
(i);
if (err != 0)
goto out_class;
}
if (err != 0)
goto out_class;
}
@@
-218,9
+217,9
@@
static int __init cpuid_init(void)
out_class:
i = 0;
for_each_online_cpu(i) {
out_class:
i = 0;
for_each_online_cpu(i) {
- class_
simple_device_remove(
MKDEV(CPUID_MAJOR, i));
+ class_
device_destroy(cpuid_class,
MKDEV(CPUID_MAJOR, i));
}
}
- class_
simple_
destroy(cpuid_class);
+ class_destroy(cpuid_class);
out_chrdev:
unregister_chrdev(CPUID_MAJOR, "cpu/cpuid");
out:
out_chrdev:
unregister_chrdev(CPUID_MAJOR, "cpu/cpuid");
out:
@@
-232,8
+231,8
@@
static void __exit cpuid_exit(void)
int cpu = 0;
for_each_online_cpu(cpu)
int cpu = 0;
for_each_online_cpu(cpu)
- class_
simple_device_remove(
MKDEV(CPUID_MAJOR, cpu));
- class_
simple_
destroy(cpuid_class);
+ class_
device_destroy(cpuid_class,
MKDEV(CPUID_MAJOR, cpu));
+ class_destroy(cpuid_class);
unregister_chrdev(CPUID_MAJOR, "cpu/cpuid");
unregister_cpu_notifier(&cpuid_class_cpu_notifier);
}
unregister_chrdev(CPUID_MAJOR, "cpu/cpuid");
unregister_cpu_notifier(&cpuid_class_cpu_notifier);
}