diff options
author | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2014-10-31 16:49:32 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-11-10 11:16:40 +0100 |
commit | 54279552bd260532d90e7a59fbc931924bbb0f7b (patch) | |
tree | f62846d03d74c2571742ba070dcfc9664748078b /arch/x86/xen/smp.c | |
parent | x86, kaslr: Prevent .bss from overlaping initrd (diff) | |
download | linux-54279552bd260532d90e7a59fbc931924bbb0f7b.tar.xz linux-54279552bd260532d90e7a59fbc931924bbb0f7b.zip |
x86/core, x86/xen/smp: Use 'die_complete' completion when taking CPU down
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.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: David Vrabel <david.vrabel@citrix.com>
Cc: tianyu.lan@intel.com
Cc: konrad.wilk@oracle.com
Cc: xen-devel@lists.xenproject.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/1414770572-7950-1-git-send-email-boris.ostrovsky@oracle.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/xen/smp.c')
-rw-r--r-- | arch/x86/xen/smp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 8650cdb53209..4c071aeb8417 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -510,6 +510,9 @@ static void xen_cpu_die(unsigned int cpu) current->state = TASK_UNINTERRUPTIBLE; schedule_timeout(HZ/10); } + + cpu_die_common(cpu); + xen_smp_intr_free(cpu); xen_uninit_lock_cpu(cpu); xen_teardown_timer(cpu); |