Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be6b5a35 authored by Chandra Seetharaman's avatar Chandra Seetharaman Committed by Linus Torvalds
Browse files

[PATCH] cpu hotplug: use hotplug version of registration in late inits 



Use hotplug version of register_cpu_notifier in late init functions.

Signed-off-by: default avatarChandra Seetharaman <sekharan@us.ibm.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7c7165c9

arch/i386/kernel/cpu/intel_cacheinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ static int __cpuinit cache_sysfs_init(void) 
	if (num_cache_leaves == 0)

		return 0;



	register_cpu_notifier(&cacheinfo_cpu_notifier);

	register_hotcpu_notifier(&cacheinfo_cpu_notifier);



	for_each_online_cpu(i) {

		cacheinfo_cpu_callback(&cacheinfo_cpu_notifier, CPU_ONLINE,

arch/ia64/kernel/palinfo.c

+6 −7
Original line number Diff line number Diff line
@@ -958,9 +958,9 @@ remove_palinfo_proc_entries(unsigned int hcpu) 
	}

}



static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb,

								unsigned long action,

								void *hcpu)

#ifdef CONFIG_HOTPLUG_CPU

static int palinfo_cpu_callback(struct notifier_block *nfb,

					unsigned long action, void *hcpu)

{

	unsigned int hotcpu = (unsigned long)hcpu;
@@ -968,20 +968,19 @@ static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb, 
	case CPU_ONLINE:

		create_palinfo_proc_entries(hotcpu);

		break;

#ifdef CONFIG_HOTPLUG_CPU

	case CPU_DEAD:

		remove_palinfo_proc_entries(hotcpu);

		break;

#endif

	}

	return NOTIFY_OK;

}



static struct notifier_block __cpuinitdata palinfo_cpu_notifier =

static struct notifier_block palinfo_cpu_notifier =

{

	.notifier_call = palinfo_cpu_callback,

	.priority = 0,

};

#endif



static int __init

palinfo_init(void)
@@ -1020,7 +1019,7 @@ palinfo_exit(void) 
	/*

	 * Unregister from cpu notifier callbacks

	 */

	unregister_cpu_notifier(&palinfo_cpu_notifier);

	unregister_hotcpu_notifier(&palinfo_cpu_notifier);

}



module_init(palinfo_init);

arch/ia64/kernel/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static int __cpuinit cache_sysfs_init(void) 
				(void *)(long)i);

	}



	register_cpu_notifier(&cache_cpu_notifier);

	register_hotcpu_notifier(&cache_cpu_notifier);



	return 0;

}

arch/s390/appldata/appldata_base.c

+5 −5
Original line number Diff line number Diff line
@@ -617,7 +617,8 @@ appldata_offline_cpu(int cpu) 
	spin_unlock(&appldata_timer_lock);

}



static int __cpuinit

#ifdef CONFIG_HOTPLUG_CPU

static int

appldata_cpu_notify(struct notifier_block *self,

		    unsigned long action, void *hcpu)

{
@@ -625,20 +626,19 @@ appldata_cpu_notify(struct notifier_block *self, 
	case CPU_ONLINE:

		appldata_online_cpu((long) hcpu);

		break;

#ifdef CONFIG_HOTPLUG_CPU

	case CPU_DEAD:

		appldata_offline_cpu((long) hcpu);

		break;

#endif

	default:

		break;

	}

	return NOTIFY_OK;

}



static struct notifier_block __devinitdata appldata_nb = {

static struct notifier_block appldata_nb = {

	.notifier_call = appldata_cpu_notify,

};

#endif



/*

 * appldata_init()
@@ -662,7 +662,7 @@ static int __init appldata_init(void) 
		appldata_online_cpu(i);



	/* Register cpu hotplug notifier */

	register_cpu_notifier(&appldata_nb);

	register_hotcpu_notifier(&appldata_nb);



	appldata_sysctl_header = register_sysctl_table(appldata_dir_table, 1);

#ifdef MODULE

arch/x86_64/kernel/mce.c

+5 −7
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static __cpuinit int mce_create_device(unsigned int cpu) 
}



#ifdef CONFIG_HOTPLUG_CPU

static __cpuinit void mce_remove_device(unsigned int cpu)

static void mce_remove_device(unsigned int cpu)

{

	int i;
@@ -626,10 +626,9 @@ static __cpuinit void mce_remove_device(unsigned int cpu) 
	sysdev_remove_file(&per_cpu(device_mce,cpu), &attr_check_interval);

	sysdev_unregister(&per_cpu(device_mce,cpu));

}

#endif



/* Get notified when a cpu comes on/off. Be hotplug friendly. */

static __cpuinit int

static int

mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)

{

	unsigned int cpu = (unsigned long)hcpu;
@@ -638,18 +637,17 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) 
	case CPU_ONLINE:

		mce_create_device(cpu);

		break;

#ifdef CONFIG_HOTPLUG_CPU

	case CPU_DEAD:

		mce_remove_device(cpu);

		break;

#endif

	}

	return NOTIFY_OK;

}



static struct notifier_block __cpuinitdata mce_cpu_notifier = {

static struct notifier_block mce_cpu_notifier = {

	.notifier_call = mce_cpu_callback,

};

#endif



static __init int mce_init_device(void)

{
@@ -664,7 +662,7 @@ static __init int mce_init_device(void) 
		mce_create_device(i);

	}



	register_cpu_notifier(&mce_cpu_notifier);

	register_hotcpu_notifier(&mce_cpu_notifier);

	misc_register(&mce_log_device);

	return err;

}