4 files changed, 10 insertions, 11 deletions

diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 2e7ff0c5cf42..53aaefeb3386 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -124,7 +124,7 @@ config CBE_CPUFREQ
 
 config CBE_CPUFREQ_PMI_ENABLE
         bool "CBE frequency scaling using PMI interface"
-        depends on CBE_CPUFREQ && EXPERIMENTAL
+        depends on CBE_CPUFREQ
         default n
         help
           Select this, if you want to use the PMI interface
diff --git a/arch/powerpc/platforms/cell/celleb_scc_sio.c b/arch/powerpc/platforms/cell/celleb_scc_sio.c
index 3a16c5b3c464..9c339ec646f5 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_sio.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_sio.c
@@ -42,14 +42,13 @@ static struct {
 static int __init txx9_serial_init(void)
 {
         extern int early_serial_txx9_setup(struct uart_port *port);
-        struct device_node *node = NULL;
+        struct device_node *node;
         int i;
         struct uart_port req;
         struct of_irq irq;
         struct resource res;
 
-        while ((node = of_find_compatible_node(node,
-                                "serial", "toshiba,sio-scc")) != NULL) {
+        for_each_compatible_node(node, "serial", "toshiba,sio-scc") {
                 for (i = 0; i < ARRAY_SIZE(txx9_scc_tab); i++) {
                         if (!(txx9_serial_bitmap & (1<<i)))
                                 continue;
diff --git a/arch/powerpc/platforms/cell/spu_callbacks.c b/arch/powerpc/platforms/cell/spu_callbacks.c
index 75d613313f10..b0ec78e8ad68 100644
--- a/arch/powerpc/platforms/cell/spu_callbacks.c
+++ b/arch/powerpc/platforms/cell/spu_callbacks.c
@@ -60,13 +60,12 @@ long spu_sys_callback(struct spu_syscall_block *s)
 
         syscall = spu_syscall_table[s->nr_ret];
 
-#ifdef DEBUG
-        print_symbol(KERN_DEBUG "SPU-syscall %s:", (unsigned long)syscall);
-        printk("syscall%ld(%lx, %lx, %lx, %lx, %lx, %lx)\n",
-                        s->nr_ret,
-                        s->parm[0], s->parm[1], s->parm[2],
-                        s->parm[3], s->parm[4], s->parm[5]);
-#endif
+        pr_debug("SPU-syscall "
+                 "%pSR:syscall%lld(%llx, %llx, %llx, %llx, %llx, %llx)\n",
+                 syscall,
+                 s->nr_ret,
+                 s->parm[0], s->parm[1], s->parm[2],
+                 s->parm[3], s->parm[4], s->parm[5]);
 
         return syscall(s->parm[0], s->parm[1], s->parm[2],
                        s->parm[3], s->parm[4], s->parm[5]);
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 25db92a8e1cf..49318385d4fa 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -24,6 +24,7 @@
 
 #include <linux/errno.h>
 #include <linux/sched.h>
+#include <linux/sched/rt.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/slab.h>