3 files changed, 22 insertions, 8 deletions

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 8fa51b0a32d2..cc3f64c084c5 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -767,14 +767,14 @@ config CPM2
           on it (826x, 827x, 8560).
 
 config PPC_CHRP
-        bool "  Common Hardware Reference Platform (CHRP) based machines"
+        bool
         depends on PPC_MULTIPLATFORM
         select PPC_I8259
         select PPC_INDIRECT_PCI
         default y
 
 config PPC_PMAC
-        bool "  Apple PowerMac based machines"
+        bool
         depends on PPC_MULTIPLATFORM
         select PPC_INDIRECT_PCI
         default y
@@ -785,7 +785,7 @@ config PPC_PMAC64
         default y
 
 config PPC_PREP
-        bool "  PowerPC Reference Platform (PReP) based machines"
+        bool
         depends on PPC_MULTIPLATFORM
         select PPC_I8259
         select PPC_INDIRECT_PCI
diff --git a/arch/ppc/kernel/smp.c b/arch/ppc/kernel/smp.c
index 43b8fc2ca591..becbfa397556 100644
--- a/arch/ppc/kernel/smp.c
+++ b/arch/ppc/kernel/smp.c
@@ -301,6 +301,10 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 
         /* Probe platform for CPUs: always linear. */
         num_cpus = smp_ops->probe();
+        
+        if (num_cpus < 2)
+                smp_tb_synchronized = 1;
+        
         for (i = 0; i < num_cpus; ++i)
                 cpu_set(i, cpu_possible_map);
 
diff --git a/arch/ppc/platforms/pmac_feature.c b/arch/ppc/platforms/pmac_feature.c
index 1e69b0593162..6b7b3a150631 100644
--- a/arch/ppc/platforms/pmac_feature.c
+++ b/arch/ppc/platforms/pmac_feature.c
@@ -1606,11 +1606,19 @@ void pmac_tweak_clock_spreading(int enable)
          */
 
         if (macio->type == macio_intrepid) {
-                if (enable)
-                        UN_OUT(UNI_N_CLOCK_SPREADING, 2);
-                else
-                        UN_OUT(UNI_N_CLOCK_SPREADING, 0);
-                mdelay(40);
+                struct device_node *clock =
+                        of_find_node_by_path("/uni-n@f8000000/hw-clock");
+                if (clock && get_property(clock, "platform-do-clockspreading",
+                                          NULL)) {
+                        printk(KERN_INFO "%sabling clock spreading on Intrepid"
+                               " ASIC\n", enable ? "En" : "Dis");
+                        if (enable)
+                                UN_OUT(UNI_N_CLOCK_SPREADING, 2);
+                        else
+                                UN_OUT(UNI_N_CLOCK_SPREADING, 0);
+                        mdelay(40);
+                }
+                of_node_put(clock);
         }
 
         while (machine_is_compatible("PowerBook5,2") ||
@@ -1680,6 +1688,8 @@ void pmac_tweak_clock_spreading(int enable)
                         pmac_low_i2c_close(ui2c);
                         break;
                 }
+                printk(KERN_INFO "%sabling clock spreading on i2c clock chip\n",
+                       enable ? "En" : "Dis");
                 pmac_low_i2c_setmode(ui2c, pmac_low_i2c_mode_stdsub);
                 rc = pmac_low_i2c_xfer(ui2c, 0xd2 | pmac_low_i2c_write, 0x80, buffer, 9);
                 DBG("write result: %d,", rc);