[PATCH] msr.c: use register_hotcpu_notifier() (e09793bb) · Commits · 戴 / test

arch/i386/kernel/msr.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -251,7 +251,9 @@ static int msr_class_device_create(int i)
		return err;
		}

		static int msr_class_cpu_callback(struct notifier_block nfb, unsigned long action, void hcpu)
		#ifdef CONFIG_HOTPLUG_CPU
		static int msr_class_cpu_callback(struct notifier_block *nfb,
		unsigned long action, void *hcpu)
		{
		unsigned int cpu = (unsigned long)hcpu;

		@@ -270,6 +272,7 @@ static struct notifier_block __cpuinitdata msr_class_cpu_notifier =
		{
		.notifier_call = msr_class_cpu_callback,
		};
		#endif

		static int __init msr_init(void)
		{
		@@ -292,7 +295,7 @@ static int __init msr_init(void)
		if (err != 0)
		goto out_class;
		}
		register_cpu_notifier(&msr_class_cpu_notifier);
		register_hotcpu_notifier(&msr_class_cpu_notifier);

		err = 0;
		goto out;
		@@ -315,7 +318,7 @@ static void __exit msr_exit(void)
		class_device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));
		class_destroy(msr_class);
		unregister_chrdev(MSR_MAJOR, "cpu/msr");
		unregister_cpu_notifier(&msr_class_cpu_notifier);
		unregister_hotcpu_notifier(&msr_class_cpu_notifier);
		}

		module_init(msr_init);