The patch titled
cpu hotplug: use hotplug version of cpu notifier in appropriate places
has been added to the -mm tree. Its filename is
cpu-hotplug-use-hotplug-version-of-cpu-notifier-in-appropriate-places.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: cpu hotplug: use hotplug version of cpu notifier in appropriate places
From: Chandra Seetharaman <sekharan@xxxxxxxxxx>
Make use the of newly defined hotplug version of cpu_notifier functionality
wherever appropriate.
Signed-off-by: Chandra Seetharaman <sekharan@xxxxxxxxxx>
Cc: Ashok Raj <ashok.raj@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/ia64/kernel/salinfo.c | 4 +---
block/ll_rw_blk.c | 4 +---
fs/xfs/xfs_mount.c | 18 ++++++++++--------
3 files changed, 12 insertions(+), 14 deletions(-)
diff -puN arch/ia64/kernel/salinfo.c~cpu-hotplug-use-hotplug-version-of-cpu-notifier-in-appropriate-places arch/ia64/kernel/salinfo.c
--- a/arch/ia64/kernel/salinfo.c~cpu-hotplug-use-hotplug-version-of-cpu-notifier-in-appropriate-places
+++ a/arch/ia64/kernel/salinfo.c
@@ -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;
}
diff -puN block/ll_rw_blk.c~cpu-hotplug-use-hotplug-version-of-cpu-notifier-in-appropriate-places block/ll_rw_blk.c
--- a/block/ll_rw_blk.c~cpu-hotplug-use-hotplug-version-of-cpu-notifier-in-appropriate-places
+++ a/block/ll_rw_blk.c
@@ -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;
diff -puN fs/xfs/xfs_mount.c~cpu-hotplug-use-hotplug-version-of-cpu-notifier-in-appropriate-places fs/xfs/xfs_mount.c
--- a/fs/xfs/xfs_mount.c~cpu-hotplug-use-hotplug-version-of-cpu-notifier-in-appropriate-places
+++ a/fs/xfs/xfs_mount.c
@@ -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);
}
}
_
Patches currently in -mm which might be from sekharan@xxxxxxxxxx are
cpu-hotplug-revert-init-patch-submitted-for-2617.patch
cpu-hotplug-revert-initdata-patch-submitted-for-2617.patch
cpu-hotplug-make-register_cpu_notifier-init-time-only.patch
cpu-hotplug-make-cpu_notifier-related-notifier-blocks-__cpuinit-only.patch
cpu-hotplug-make-cpu_notifier-related-notifier-calls-__cpuinit-only.patch
cpu-hotplug-add-hotplug-versions-of-cpu_notifier.patch
cpu-hotplug-use-hotplug-version-of-cpu-notifier-in-appropriate-places.patch
per-task-delay-accounting-cpu-delay-collection-via-schedstats.patch
task-watchers-task-watchers.patch
task-watchers-task-watchers-tidy.patch
task-watchers-register-per-task-delay-accounting.patch
task-watchers-add-support-for-per-task-watchers.patch
task-watchers-add-support-for-per-task-watchers-warning-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
