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

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (92 commits)
  powerpc: Remove unused 'protect4gb' boot parameter
  powerpc: Build-in e1000e for pseries & ppc64_defconfig
  powerpc/pseries: Make request_ras_irqs() available to other pseries code
  powerpc/numa: Use ibm,architecture-vec-5 to detect form 1 affinity
  powerpc/numa: Set a smaller value for RECLAIM_DISTANCE to enable zone reclaim
  powerpc: Use smt_snooze_delay=-1 to always busy loop
  powerpc: Remove check of ibm,smt-snooze-delay OF property
  powerpc/kdump: Fix race in kdump shutdown
  powerpc/kexec: Fix race in kexec shutdown
  powerpc/kexec: Speedup kexec hash PTE tear down
  powerpc/pseries: Add hcall to read 4 ptes at a time in real mode
  powerpc: Use more accurate limit for first segment memory allocations
  powerpc/kdump: Use chip->shutdown to disable IRQs
  powerpc/kdump: CPUs assume the context of the oopsing CPU
  powerpc/crashdump: Do not fail on NULL pointer dereferencing
  powerpc/eeh: Fix oops when probing in early boot
  powerpc/pci: Check devices status property when scanning OF tree
  powerpc/vio: Switch VIO Bus PM to use generic helpers
  powerpc: Avoid bad relocations in iSeries code
  powerpc: Use common cpu_die (fixes SMP+SUSPEND build)
  ...

1 files changed, 11 insertions, 5 deletions

diff --git a/arch/powerpc/kernel/rtasd.c b/arch/powerpc/kernel/rtasd.c
index 4190eae7850a..638883e23e3a 100644
--- a/arch/powerpc/kernel/rtasd.c
+++ b/arch/powerpc/kernel/rtasd.c
@@ -411,9 +411,9 @@ static void rtas_event_scan(struct work_struct *w)
 
         get_online_cpus();
 
-        cpu = next_cpu(smp_processor_id(), cpu_online_map);
-        if (cpu == NR_CPUS) {
-                cpu = first_cpu(cpu_online_map);
+        cpu = cpumask_next(smp_processor_id(), cpu_online_mask);
+        if (cpu >= nr_cpu_ids) {
+                cpu = cpumask_first(cpu_online_mask);
 
                 if (first_pass) {
                         first_pass = 0;
@@ -466,8 +466,8 @@ static void start_event_scan(void)
         /* Retreive errors from nvram if any */
         retreive_nvram_error_log();
 
-        schedule_delayed_work_on(first_cpu(cpu_online_map), &event_scan_work,
-                                 event_scan_delay);
+        schedule_delayed_work_on(cpumask_first(cpu_online_mask),
+                                 &event_scan_work, event_scan_delay);
 }
 
 static int __init rtas_init(void)
@@ -490,6 +490,12 @@ static int __init rtas_init(void)
                 return -ENODEV;
         }
 
+        if (!rtas_event_scan_rate) {
+                /* Broken firmware: take a rate of zero to mean don't scan */
+                printk(KERN_DEBUG "rtasd: scan rate is 0, not scanning\n");
+                return 0;
+        }
+
         /* Make room for the sequence number */
         rtas_error_log_max = rtas_get_error_log_max();
         rtas_error_log_buffer_max = rtas_error_log_max + sizeof(int);