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

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

[PATCH] cpu hotplug: use hotplug version of cpu notifier in appropriate places 



Make use the of newly defined hotplug version of cpu_notifier functionality
wherever appropriate.

Signed-off-by: default avatarChandra Seetharaman <sekharan@us.ibm.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 39f4885c

arch/ia64/kernel/salinfo.c

+1 −3
Original line number Diff line number Diff line
@@ -673,9 +673,7 @@ salinfo_init(void) 
	salinfo_timer.function = &salinfo_timeout;

	add_timer(&salinfo_timer);



#ifdef	CONFIG_HOTPLUG_CPU

	register_cpu_notifier(&salinfo_cpu_notifier);

#endif

	register_hotcpu_notifier(&salinfo_cpu_notifier);



	return 0;

}

block/ll_rw_blk.c

+1 −3
Original line number Diff line number Diff line
@@ -3541,9 +3541,7 @@ int __init blk_dev_init(void) 
		INIT_LIST_HEAD(&per_cpu(blk_cpu_done, i));



	open_softirq(BLOCK_SOFTIRQ, blk_done_softirq, NULL);

#ifdef CONFIG_HOTPLUG_CPU

	register_cpu_notifier(&blk_cpu_notifier);

#endif

	register_hotcpu_notifier(&blk_cpu_notifier);



	blk_max_low_pfn = max_low_pfn;

	blk_max_pfn = max_pfn;

fs/xfs/xfs_mount.c

+10 −8
Original line number Diff line number Diff line
@@ -1721,15 +1721,14 @@ xfs_mount_log_sbunit( 
 * is present to prevent thrashing).

 */



#ifdef CONFIG_HOTPLUG_CPU

/*

 * hot-plug CPU notifier support.

 *

 * We cannot use the hotcpu_register() function because it does

 * not allow notifier instances. We need a notifier per filesystem

 * as we need to be able to identify the filesystem to balance

 * the counters out. This is achieved by having a notifier block

 * embedded in the xfs_mount_t and doing pointer magic to get the

 * mount pointer from the notifier block address.

 * We need a notifier per filesystem as we need to be able to identify

 * the filesystem to balance the counters out. This is achieved by

 * having a notifier block embedded in the xfs_mount_t and doing pointer

 * magic to get the mount pointer from the notifier block address.

 */

STATIC int

xfs_icsb_cpu_notify(
@@ -1779,6 +1778,7 @@ xfs_icsb_cpu_notify( 


	return NOTIFY_OK;

}

#endif /* CONFIG_HOTPLUG_CPU */



int

xfs_icsb_init_counters(
@@ -1791,9 +1791,11 @@ xfs_icsb_init_counters( 
	if (mp->m_sb_cnts == NULL)

		return -ENOMEM;



#ifdef CONFIG_HOTPLUG_CPU

	mp->m_icsb_notifier.notifier_call = xfs_icsb_cpu_notify;

	mp->m_icsb_notifier.priority = 0;

	register_cpu_notifier(&mp->m_icsb_notifier);

	register_hotcpu_notifier(&mp->m_icsb_notifier);

#endif /* CONFIG_HOTPLUG_CPU */



	for_each_online_cpu(i) {

		cntp = (xfs_icsb_cnts_t *)per_cpu_ptr(mp->m_sb_cnts, i);
@@ -1812,7 +1814,7 @@ xfs_icsb_destroy_counters( 
	xfs_mount_t	*mp)

{

	if (mp->m_sb_cnts) {

		unregister_cpu_notifier(&mp->m_icsb_notifier);

		unregister_hotcpu_notifier(&mp->m_icsb_notifier);

		free_percpu(mp->m_sb_cnts);

	}

}