Merge branch 'topic/paca' into next
Bring in yet another series that touches KVM code, and might need to be merged into the kvm-ppc branch to resolve conflicts. This required some changes in pnv_power9_force_smt4_catch/release() due to the paca array becomming an array of pointers.
This commit is contained in:
@@ -293,7 +293,7 @@ static void pnv_kexec_wait_secondaries_down(void)
|
||||
if (i != notified) {
|
||||
printk(KERN_INFO "kexec: waiting for cpu %d "
|
||||
"(physical %d) to enter OPAL\n",
|
||||
i, paca[i].hw_cpu_id);
|
||||
i, paca_ptrs[i]->hw_cpu_id);
|
||||
notified = i;
|
||||
}
|
||||
|
||||
@@ -305,7 +305,7 @@ static void pnv_kexec_wait_secondaries_down(void)
|
||||
if (timeout-- == 0) {
|
||||
printk(KERN_ERR "kexec: timed out waiting for "
|
||||
"cpu %d (physical %d) to enter OPAL\n",
|
||||
i, paca[i].hw_cpu_id);
|
||||
i, paca_ptrs[i]->hw_cpu_id);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
Verwijs in nieuw issue
Block a user