git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull bugzilla-5452 into release branch
[pandora-kernel.git]
/
arch
/
i386
/
kernel
/
cpuid.c
diff --git
a/arch/i386/kernel/cpuid.c
b/arch/i386/kernel/cpuid.c
index
13bae79
..
1d9a4ab
100644
(file)
--- a/
arch/i386/kernel/cpuid.c
+++ b/
arch/i386/kernel/cpuid.c
@@
-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;
@@
-169,7
+168,7
@@
static int cpuid_class_device_create(int i)
return 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;
{
unsigned int cpu = (unsigned long)hcpu;