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.
Signed-off-by: Alex Chiang <achiang@xxxxxx>
---
Tony, unlike my previous patch, this patch is .30 material,
thanks.
---
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 1146399..92fe9cf 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -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();
--
To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|