From c17c79fbbd0875892e10ade0d1f65125b401a1f7 Mon Sep 17 00:00:00 2001
From: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Mon, 29 Apr 2013 03:45:36 +0000
Subject: [PATCH] --- yaml --- r: 370879 b: refs/heads/master c:
 601abdc3b4773afb9a80afc9c4c024724b7c5f4e h: refs/heads/master i:   370877:
 364d8da86a32b4e59c0aeda82bd8dbbd7ebcda97   370875:
 3d99ca637162d0953723e159888d88668e2111b9   370871:
 35c836eb5477d8dd554601a340c29e043b4297af   370863:
 8c03cc4244a8c2d197f61f0f341d64dff662f910   370847:
 93db2929455e7b7b1cd58d106921904e6ddd368e   370815:
 c15b099ce0b9bde14e1391eb6d0faeeb8cd1570c v: v3

---
 [refs]                       | 2 +-
 trunk/arch/powerpc/mm/numa.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 23642cba26a6..1630458788b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 177c19237b886a2ab71011c9e6f40190e5c24b83
+refs/heads/master: 601abdc3b4773afb9a80afc9c4c024724b7c5f4e
diff --git a/trunk/arch/powerpc/mm/numa.c b/trunk/arch/powerpc/mm/numa.c
index 490e39c8d8f6..c3bd046f801a 100644
--- a/trunk/arch/powerpc/mm/numa.c
+++ b/trunk/arch/powerpc/mm/numa.c
@@ -1530,6 +1530,8 @@ static void reset_topology_timer(void)
 	mod_timer(&topology_timer, topology_timer.expires);
 }
 
+#ifdef CONFIG_SMP
+
 static void stage_topology_update(int core_id)
 {
 	cpumask_or(&cpu_associativity_changes_mask,
@@ -1563,6 +1565,8 @@ static struct notifier_block dt_update_nb = {
 	.notifier_call = dt_update_callback,
 };
 
+#endif
+
 /*
  * Start polling for associativity changes.
  */
@@ -1574,7 +1578,9 @@ int start_topology_update(void)
 		if (!prrn_enabled) {
 			prrn_enabled = 1;
 			vphn_enabled = 0;
+#ifdef CONFIG_SMP
 			rc = of_reconfig_notifier_register(&dt_update_nb);
+#endif
 		}
 	} else if (firmware_has_feature(FW_FEATURE_VPHN) &&
 		   get_lppaca()->shared_proc) {
@@ -1599,7 +1605,9 @@ int stop_topology_update(void)
 
 	if (prrn_enabled) {
 		prrn_enabled = 0;
+#ifdef CONFIG_SMP
 		rc = of_reconfig_notifier_unregister(&dt_update_nb);
+#endif
 	} else if (vphn_enabled) {
 		vphn_enabled = 0;
 		rc = del_timer_sync(&topology_timer);