lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc/pseries: Simplify vpa deregistration functions

Browse Source 
The VPA, SLB shadow and DTL degistration functions do not need an
address, so simplify things and remove it.

Also cleanup pseries_kexec_cpu_down a bit by storing the cpu IDs
in local variables.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Anton Blanchard
2011-07-25 01:46:34 +00:00
committed by Benjamin Herrenschmidt
parent 711ef84e80
commit 598c8231ab
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
arch/powerpc/platforms/pseries/kexec.c
View File

@@ -25,34 +25,30 @@ static void pseries_kexec_cpu_down(int crash_shutdown, int secondary)
{
/* Don't risk a hypervisor call if we're crashing */
if (firmware_has_feature(FW_FEATURE_SPLPAR) && !crash_shutdown) {
unsigned long addr;
int ret;
int cpu = smp_processor_id();
int hwcpu = hard_smp_processor_id();
if (get_lppaca()->dtl_enable_mask) {
ret = unregister_dtl(hard_smp_processor_id());
ret = unregister_dtl(hwcpu);
if (ret) {
pr_err("WARNING: DTL deregistration for cpu "
"%d (hw %d) failed with %d\n",
smp_processor_id(),
hard_smp_processor_id(), ret);
cpu, hwcpu, ret);
}
}
addr = __pa(get_slb_shadow());
ret = unregister_slb_shadow(hard_smp_processor_id(), addr);
ret = unregister_slb_shadow(hwcpu);
if (ret) {
pr_err("WARNING: SLB shadow buffer deregistration "
"for cpu %d (hw %d) failed with %d\n",
smp_processor_id(),
hard_smp_processor_id(), ret);
cpu, hwcpu, ret);
}
addr = __pa(get_lppaca());
ret = unregister_vpa(hard_smp_processor_id(), addr);
ret = unregister_vpa(hwcpu);
if (ret) {
pr_err("WARNING: VPA deregistration for cpu %d "
"(hw %d) failed with %d\n", smp_processor_id(),
hard_smp_processor_id(), ret);
"(hw %d) failed with %d\n", cpu, hwcpu, ret);
}
}
}