Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc/xive: Remove xive_kexec_teardown_cpu()

It's identical to xive_teardown_cpu() so just use the latter

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

authored by

Benjamin Herrenschmidt and committed by
Michael Ellerman
e27e0a94 dbc57402

+2 -25
-1
arch/powerpc/include/asm/xive.h
··· 87 87 extern void xive_smp_setup_cpu(void); 88 88 extern void xive_smp_disable_cpu(void); 89 89 extern void xive_teardown_cpu(void); 90 - extern void xive_kexec_teardown_cpu(int secondary); 91 90 extern void xive_shutdown(void); 92 91 extern void xive_flush_interrupt(void); 93 92
+1 -1
arch/powerpc/platforms/powernv/setup.c
··· 314 314 u64 reinit_flags; 315 315 316 316 if (xive_enabled()) 317 - xive_kexec_teardown_cpu(secondary); 317 + xive_teardown_cpu(); 318 318 else 319 319 xics_kexec_teardown_cpu(secondary); 320 320
+1 -1
arch/powerpc/platforms/pseries/kexec.c
··· 58 58 } 59 59 60 60 if (xive_enabled()) { 61 - xive_kexec_teardown_cpu(secondary); 61 + xive_teardown_cpu(); 62 62 63 63 if (!secondary) 64 64 xive_shutdown();
-22
arch/powerpc/sysdev/xive/common.c
··· 1408 1408 xive_cleanup_cpu_queues(cpu, xc); 1409 1409 } 1410 1410 1411 - void xive_kexec_teardown_cpu(int secondary) 1412 - { 1413 - struct xive_cpu *xc = __this_cpu_read(xive_cpu); 1414 - unsigned int cpu = smp_processor_id(); 1415 - 1416 - /* Set CPPR to 0 to disable flow of interrupts */ 1417 - xc->cppr = 0; 1418 - out_8(xive_tima + xive_tima_offset + TM_CPPR, 0); 1419 - 1420 - /* Backend cleanup if any */ 1421 - if (xive_ops->teardown_cpu) 1422 - xive_ops->teardown_cpu(cpu, xc); 1423 - 1424 - #ifdef CONFIG_SMP 1425 - /* Get rid of IPI */ 1426 - xive_cleanup_cpu_ipi(cpu, xc); 1427 - #endif 1428 - 1429 - /* Disable and free the queues */ 1430 - xive_cleanup_cpu_queues(cpu, xc); 1431 - } 1432 - 1433 1411 void xive_shutdown(void) 1434 1412 { 1435 1413 xive_ops->shutdown();