Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (103 commits)
  powerpc: Fix bug in move of altivec code to vector.S
  powerpc: Add support for swiotlb on 32-bit
  powerpc/spufs: Remove unused error path
  powerpc: Fix warning when printing a resource_size_t
  powerpc/xmon: Remove unused variable in xmon.c
  powerpc/pseries: Fix warnings when printing resource_size_t
  powerpc: Shield code specific to 64-bit server processors
  powerpc: Separate PACA fields for server CPUs
  powerpc: Split exception handling out of head_64.S
  powerpc: Introduce CONFIG_PPC_BOOK3S
  powerpc: Move VMX and VSX asm code to vector.S
  powerpc: Set init_bootmem_done on NUMA platforms as well
  powerpc/mm: Fix a AB->BA deadlock scenario with nohash MMU context lock
  powerpc/mm: Fix some SMP issues with MMU context handling
  powerpc: Add PTRACE_SINGLEBLOCK support
  fbdev: Add PLB support and cleanup DCR in xilinxfb driver.
  powerpc/virtex: Add ml510 reference design device tree
  powerpc/virtex: Add Xilinx ML510 reference design support
  powerpc/virtex: refactor intc driver and add support for i8259 cascading
  powerpc/virtex: Add support for Xilinx PCI host bridge
  ...

1 files changed, 38 insertions, 38 deletions

diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index afad9f5ac0ac..b3cbac855924 100644
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/arch/powerpc/platforms/pseries/rtasd.c
@@ -19,7 +19,7 @@
 #include <linux/vmalloc.h>
 #include <linux/spinlock.h>
 #include <linux/cpu.h>
-#include <linux/delay.h>
+#include <linux/workqueue.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -387,36 +387,51 @@ static void do_event_scan(void)
         } while(error == 0);
 }
 
-static void do_event_scan_all_cpus(long delay)
+static void rtas_event_scan(struct work_struct *w);
+DECLARE_DELAYED_WORK(event_scan_work, rtas_event_scan);
+
+/*
+ * Delay should be at least one second since some machines have problems if
+ * we call event-scan too quickly.
+ */
+static unsigned long event_scan_delay = 1*HZ;
+static int first_pass = 1;
+
+static void rtas_event_scan(struct work_struct *w)
 {
-        int cpu;
+        unsigned int cpu;
+
+        do_event_scan();
 
         get_online_cpus();
-        cpu = first_cpu(cpu_online_map);
-        for (;;) {
-                set_cpus_allowed(current, cpumask_of_cpu(cpu));
-                do_event_scan();
-                set_cpus_allowed(current, CPU_MASK_ALL);
-
-                /* Drop hotplug lock, and sleep for the specified delay */
-                put_online_cpus();
-                msleep_interruptible(delay);
-                get_online_cpus();
-
-                cpu = next_cpu(cpu, cpu_online_map);
-                if (cpu == NR_CPUS)
-                        break;
+
+        cpu = next_cpu(smp_processor_id(), cpu_online_map);
+        if (cpu == NR_CPUS) {
+                cpu = first_cpu(cpu_online_map);
+
+                if (first_pass) {
+                        first_pass = 0;
+                        event_scan_delay = 30*HZ/rtas_event_scan_rate;
+
+                        if (surveillance_timeout != -1) {
+                                pr_debug("rtasd: enabling surveillance\n");
+                                enable_surveillance(surveillance_timeout);
+                                pr_debug("rtasd: surveillance enabled\n");
+                        }
+                }
         }
+
+        schedule_delayed_work_on(cpu, &event_scan_work,
+                __round_jiffies_relative(event_scan_delay, cpu));
+
         put_online_cpus();
 }
 
-static int rtasd(void *unused)
+static void start_event_scan(void)
 {
         unsigned int err_type;
         int rc;
 
-        daemonize("rtasd");
-
         printk(KERN_DEBUG "RTAS daemon started\n");
         pr_debug("rtasd: will sleep for %d milliseconds\n",
                  (30000 / rtas_event_scan_rate));
@@ -434,22 +449,8 @@ static int rtasd(void *unused)
                 }
         }
 
-        /* First pass. */
-        do_event_scan_all_cpus(1000);
-
-        if (surveillance_timeout != -1) {
-                pr_debug("rtasd: enabling surveillance\n");
-                enable_surveillance(surveillance_timeout);
-                pr_debug("rtasd: surveillance enabled\n");
-        }
-
-        /* Delay should be at least one second since some
-         * machines have problems if we call event-scan too
-         * quickly. */
-        for (;;)
-                do_event_scan_all_cpus(30000/rtas_event_scan_rate);
-
-        return -EINVAL;
+        schedule_delayed_work_on(first_cpu(cpu_online_map), &event_scan_work,
+                                 event_scan_delay);
 }
 
 static int __init rtas_init(void)
@@ -487,8 +488,7 @@ static int __init rtas_init(void)
         if (!entry)
                 printk(KERN_ERR "Failed to create error_log proc entry\n");
 
-        if (kernel_thread(rtasd, NULL, CLONE_FS) < 0)
-                printk(KERN_ERR "Failed to start RTAS daemon\n");
+        start_event_scan();
 
         return 0;
 }