Merge tag 'drm-intel-next-fixes-2015-04-25' of git://anongit.freedesktop.org/drm...

[cascardo/linux.git] / drivers / scsi / hpsa.c

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index a1cfbd3..8eab107 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -6632,14 +6632,12 @@ static void fail_all_outstanding_cmds(struct ctlr_info *h)
 
 static void set_lockup_detected_for_all_cpus(struct ctlr_info *h, u32 value)
 {
-       int i, cpu;
+       int cpu;
 
-       cpu = cpumask_first(cpu_online_mask);
-       for (i = 0; i < num_online_cpus(); i++) {
+       for_each_online_cpu(cpu) {
                u32 *lockup_detected;
                lockup_detected = per_cpu_ptr(h->lockup_detected, cpu);
                *lockup_detected = value;
-               cpu = cpumask_next(cpu, cpu_online_mask);
        }
        wmb(); /* be sure the per-cpu variables are out to memory */
 }