projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
kernel
/
cpuid.c
diff --git
a/arch/x86/kernel/cpuid.c
b/arch/x86/kernel/cpuid.c
index b07af8861244cd4f108181c061a3fab787a724b2..6a52d4b36a30bb2f805186f754d8e9ba39285dd0 100644
(file)
--- a/
arch/x86/kernel/cpuid.c
+++ b/
arch/x86/kernel/cpuid.c
@@
-182,7
+182,7
@@
static struct notifier_block __refdata cpuid_class_cpu_notifier =
.notifier_call = cpuid_class_cpu_callback,
};
.notifier_call = cpuid_class_cpu_callback,
};
-static char *cpuid_
nodename(struct device *dev
)
+static char *cpuid_
devnode(struct device *dev, mode_t *mode
)
{
return kasprintf(GFP_KERNEL, "cpu/%u/cpuid", MINOR(dev->devt));
}
{
return kasprintf(GFP_KERNEL, "cpu/%u/cpuid", MINOR(dev->devt));
}
@@
-203,7
+203,7
@@
static int __init cpuid_init(void)
err = PTR_ERR(cpuid_class);
goto out_chrdev;
}
err = PTR_ERR(cpuid_class);
goto out_chrdev;
}
- cpuid_class->
nodename = cpuid_nodenam
e;
+ cpuid_class->
devnode = cpuid_devnod
e;
for_each_online_cpu(i) {
err = cpuid_device_create(i);
if (err != 0)
for_each_online_cpu(i) {
err = cpuid_device_create(i);
if (err != 0)