Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 5a67e4c5b6faaccf31740a07d93704166405d880

Authored by Chandra Seetharaman
Committed by Linus Torvalds
1 parent 39f4885c56
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[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: Chandra Seetharaman <sekharan@us.ibm.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 3 changed files with 12 additions and 14 deletions Side-by-side Diff

arch/ia64/kernel/salinfo.c
Diff comments   View file @ 5a67e4c
... ... @@ -673,9 +673,7 @@
673 673 salinfo_timer.function = &salinfo_timeout;
674 674 add_timer(&salinfo_timer);
675 675  
676   -#ifdef CONFIG_HOTPLUG_CPU
677   - register_cpu_notifier(&salinfo_cpu_notifier);
678   -#endif
  676 + register_hotcpu_notifier(&salinfo_cpu_notifier);
679 677  
680 678 return 0;
681 679 }
... ... @@ -3541,9 +3541,7 @@
3541 3541 INIT_LIST_HEAD(&per_cpu(blk_cpu_done, i));
3542 3542  
3543 3543 open_softirq(BLOCK_SOFTIRQ, blk_done_softirq, NULL);
3544   -#ifdef CONFIG_HOTPLUG_CPU
3545   - register_cpu_notifier(&blk_cpu_notifier);
3546   -#endif
  3544 + register_hotcpu_notifier(&blk_cpu_notifier);
3547 3545  
3548 3546 blk_max_low_pfn = max_low_pfn;
3549 3547 blk_max_pfn = max_pfn;
... ... @@ -1721,15 +1721,14 @@
1721 1721 * is present to prevent thrashing).
1722 1722 */
1723 1723  
  1724 +#ifdef CONFIG_HOTPLUG_CPU
1724 1725 /*
1725 1726 * hot-plug CPU notifier support.
1726 1727 *
1727   - * We cannot use the hotcpu_register() function because it does
1728   - * not allow notifier instances. We need a notifier per filesystem
1729   - * as we need to be able to identify the filesystem to balance
1730   - * the counters out. This is achieved by having a notifier block
1731   - * embedded in the xfs_mount_t and doing pointer magic to get the
1732   - * mount pointer from the notifier block address.
  1728 + * We need a notifier per filesystem as we need to be able to identify
  1729 + * the filesystem to balance the counters out. This is achieved by
  1730 + * having a notifier block embedded in the xfs_mount_t and doing pointer
  1731 + * magic to get the mount pointer from the notifier block address.
1733 1732 */
1734 1733 STATIC int
1735 1734 xfs_icsb_cpu_notify(
... ... @@ -1779,6 +1778,7 @@
1779 1778  
1780 1779 return NOTIFY_OK;
1781 1780 }
  1781 +#endif /* CONFIG_HOTPLUG_CPU */
1782 1782  
1783 1783 int
1784 1784 xfs_icsb_init_counters(
1785 1785  
... ... @@ -1791,9 +1791,11 @@
1791 1791 if (mp->m_sb_cnts == NULL)
1792 1792 return -ENOMEM;
1793 1793  
  1794 +#ifdef CONFIG_HOTPLUG_CPU
1794 1795 mp->m_icsb_notifier.notifier_call = xfs_icsb_cpu_notify;
1795 1796 mp->m_icsb_notifier.priority = 0;
1796   - register_cpu_notifier(&mp->m_icsb_notifier);
  1797 + register_hotcpu_notifier(&mp->m_icsb_notifier);
  1798 +#endif /* CONFIG_HOTPLUG_CPU */
1797 1799  
1798 1800 for_each_online_cpu(i) {
1799 1801 cntp = (xfs_icsb_cnts_t *)per_cpu_ptr(mp->m_sb_cnts, i);
... ... @@ -1812,7 +1814,7 @@
1812 1814 xfs_mount_t *mp)
1813 1815 {
1814 1816 if (mp->m_sb_cnts) {
1815   - unregister_cpu_notifier(&mp->m_icsb_notifier);
  1817 + unregister_hotcpu_notifier(&mp->m_icsb_notifier);
1816 1818 free_percpu(mp->m_sb_cnts);
1817 1819 }
1818 1820 }