aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm
diff options
context:
space:
mode:
authorNathan Fontenot <nfont@linux.vnet.ibm.com>2013-04-28 23:45:36 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-04-30 01:59:35 -0400
commit601abdc3b4773afb9a80afc9c4c024724b7c5f4e (patch)
tree61994f55775088a18048c66f001432237e1632bf /arch/powerpc/mm
parent177c19237b886a2ab71011c9e6f40190e5c24b83 (diff)
powerpc/pseries: Correct builds break when CONFIG_SMP not defined
Correct build failure for powerpc/pseries builds with CONFIG_SMP not defined. The function cpu_sibling_mask has no meaning (or definition) when CONFIG_SMP is not defined. Additionally, the updating of NUMA affinity for a CPU in a UP system doesn't really make sense. This patch ifdef's out the code making the affinity updates for PRRN events to fix the following build break. arch/powerpc/mm/numa.c: In function ‘stage_topology_update’: arch/powerpc/mm/numa.c:1535: error: implicit declaration of function ‘cpu_sibling_mask’ arch/powerpc/mm/numa.c:1535: warning: passing argument 3 of ‘cpumask_or’ makes pointer from integer without a cast make[1]: *** [arch/powerpc/mm/numa.o] Error 1 Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r--arch/powerpc/mm/numa.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 490e39c8d8f6..c3bd046f801a 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1530,6 +1530,8 @@ static void reset_topology_timer(void)
1530 mod_timer(&topology_timer, topology_timer.expires); 1530 mod_timer(&topology_timer, topology_timer.expires);
1531} 1531}
1532 1532
1533#ifdef CONFIG_SMP
1534
1533static void stage_topology_update(int core_id) 1535static void stage_topology_update(int core_id)
1534{ 1536{
1535 cpumask_or(&cpu_associativity_changes_mask, 1537 cpumask_or(&cpu_associativity_changes_mask,
@@ -1563,6 +1565,8 @@ static struct notifier_block dt_update_nb = {
1563 .notifier_call = dt_update_callback, 1565 .notifier_call = dt_update_callback,
1564}; 1566};
1565 1567
1568#endif
1569
1566/* 1570/*
1567 * Start polling for associativity changes. 1571 * Start polling for associativity changes.
1568 */ 1572 */
@@ -1574,7 +1578,9 @@ int start_topology_update(void)
1574 if (!prrn_enabled) { 1578 if (!prrn_enabled) {
1575 prrn_enabled = 1; 1579 prrn_enabled = 1;
1576 vphn_enabled = 0; 1580 vphn_enabled = 0;
1581#ifdef CONFIG_SMP
1577 rc = of_reconfig_notifier_register(&dt_update_nb); 1582 rc = of_reconfig_notifier_register(&dt_update_nb);
1583#endif
1578 } 1584 }
1579 } else if (firmware_has_feature(FW_FEATURE_VPHN) && 1585 } else if (firmware_has_feature(FW_FEATURE_VPHN) &&
1580 get_lppaca()->shared_proc) { 1586 get_lppaca()->shared_proc) {
@@ -1599,7 +1605,9 @@ int stop_topology_update(void)
1599 1605
1600 if (prrn_enabled) { 1606 if (prrn_enabled) {
1601 prrn_enabled = 0; 1607 prrn_enabled = 0;
1608#ifdef CONFIG_SMP
1602 rc = of_reconfig_notifier_unregister(&dt_update_nb); 1609 rc = of_reconfig_notifier_unregister(&dt_update_nb);
1610#endif
1603 } else if (vphn_enabled) { 1611 } else if (vphn_enabled) {
1604 vphn_enabled = 0; 1612 vphn_enabled = 0;
1605 rc = del_timer_sync(&topology_timer); 1613 rc = del_timer_sync(&topology_timer);