* Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx> wrote:
On 10/22/2014 01:09 PM, Boris Ostrovsky wrote:There's a build warning fix that this change conflicts with:
Commit 2ed53c0d6cc9 ("x86/smpboot: Speed up suspend/resume by avoiding
100ms sleep for CPU offline during S3") introduced completions to CPU
offlining process. These completions are not initialized on Xen kernels
causing a panic in play_dead_common().
Move handling of die_complete into common routines to make them
available to Xen guests.
(While at it, move die_complete definition under #ifdef CONFIG_HOTPLUG_CPU)
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
Reviewed-by: David Vrabel <david.vrabel@xxxxxxxxxx>
---
v3: Don't #ifdef function prototypes in smp.h
v2: Keep die_complete private to smpboot.c
arch/x86/include/asm/smp.h | 1 +
arch/x86/kernel/smpboot.c | 13 +++++++++++--
arch/x86/xen/smp.c | 3 +++
3 files changed, 15 insertions(+), 2 deletions(-)
Does anything else need to be done in this patch? We have CPU
hotplug broken currently in Xen and it would be nice to have it
fixed in rc3.
db6a00b4bed3 x86/smpboot: Move data structure to its primary usage scope
it would be nice if you could rebase it to tip:master or
tip:x86/urgent so I can push it upstream ASAP.