Skip to contentSkip to conversation

ia64: don't need cpu_set() when migrate_platform_irqs() fails

PATCH New Alex Chiang 1 participant 1 message Feb 6, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ia64: don't need cpu_set() when migrate_platform_irqs() fails

Commit e7b14036 (prevent ia64 from invoking irq handlers on offline CPUs) removed the call to cpu_clear() before we call migrate_platform_irqs().

Thus, if migrate_platform_irqs() fails (returns -EBUSY), we do not need to re-set our CPU in the cpu_online_map, since it was never cleared.

Remove the redundant call and cleanup the resulting stylistic fallout.

---

Tony, unlike my previous patch, this patch is .30 material, thanks.

---

arch/ia64/kernel/smpboot.c +2 -4
index 1146399..92fe9cf 100644
@@ -736,10 +736,8 @@ int __cpu_disable(void)
 			return -EBUSY;
 	}
 
-	if (migrate_platform_irqs(cpu)) {
-		cpu_set(cpu, cpu_online_map);
-		return (-EBUSY);
-	}
+	if (migrate_platform_irqs(cpu))
+		return -EBUSY;
 
 	remove_siblinginfo(cpu);
 	fixup_irqs();