]>
Commit | Line | Data |
---|---|---|
00e5a55c BS |
1 | From: Alex Chiang <achiang@hp.com> |
2 | Subject: IA64: first clear CPU from online map, then fixup IRQs. | |
3 | References: bnc#386714 | |
4 | ||
5 | Acked-by: Raymund Will <rw@suse.de> | |
6 | ||
7 | --- | |
8 | arch/ia64/kernel/smpboot.c | 8 +++----- | |
9 | 1 file changed, 3 insertions(+), 5 deletions(-) | |
10 | ||
11 | --- a/arch/ia64/kernel/smpboot.c | |
12 | +++ b/arch/ia64/kernel/smpboot.c | |
13 | @@ -741,14 +741,12 @@ int __cpu_disable(void) | |
14 | return -EBUSY; | |
15 | } | |
16 | ||
17 | - if (migrate_platform_irqs(cpu)) { | |
18 | - cpu_set(cpu, cpu_online_map); | |
19 | - return (-EBUSY); | |
20 | - } | |
21 | + if (migrate_platform_irqs(cpu)) | |
22 | + return -EBUSY; | |
23 | ||
24 | remove_siblinginfo(cpu); | |
25 | - fixup_irqs(); | |
26 | cpu_clear(cpu, cpu_online_map); | |
27 | + fixup_irqs(); | |
28 | local_flush_tlb_all(); | |
29 | cpu_clear(cpu, cpu_callin_map); | |
30 | return 0; |