Commit-ID: 72683c9757cd26ccbe26e8bcb4a1082d287a8a6b
Gitweb: http://git.kernel.org/tip/72683c9757cd26ccbe26e8bcb4a1082d287a8a6b
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Mon, 21 Nov 2016 17:00:49 +0100
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Mon, 21 Nov 2016 17:06:27 +0100
x86/cpuid/msr: Fix typoed variable names and other last minute crap
Compiling w/o enabling the config switch does not really catch the issues.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
arch/x86/kernel/cpuid.c | 2 +-
arch/x86/kernel/msr.c | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index e93e9f0..373e372 100644
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -45,7 +45,7 @@
#include <asm/msr.h>
static struct class *cpuid_class;
-static enum cpuhp_state cpuid_hp_state;
+static enum cpuhp_state cpuhp_cpuid_state;
struct cpuid_regs {
u32 eax, ebx, ecx, edx;
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 7935815..f5e3ff8 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -207,8 +207,7 @@ static int __init msr_init(void)
if (__register_chrdev(MSR_MAJOR, 0, NR_CPUS, "cpu/msr", &msr_fops)) {
pr_err("unable to get major %d for msr\n", MSR_MAJOR);
- err = -EBUSY;
- goto out;
+ return -EBUSY;
}
msr_class = class_create(THIS_MODULE, "msr");
if (IS_ERR(msr_class)) {
@@ -217,7 +216,7 @@ static int __init msr_init(void)
}
msr_class->devnode = msr_devnode;
- err = cpuhp_setup_state(CPUHP_X86_MSR_PREPARE, "x86/msr:online",
+ err = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "x86/msr:online",
msr_device_create, msr_device_destroy);
if (err < 0)
goto out_class;
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|