]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel"
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 10 Jan 2012 20:43:47 +0000 (15:43 -0500)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Tue, 10 Jan 2012 22:41:27 +0000 (14:41 -0800)
commita5541d5d24aeb8f92ad06fee857bf3af2d091ac7
tree78e56b51a40b047e5c22809934b0f94cd3a26ee0
parent7c479335a0d899cfc7d3a1ccc16899e87f7765c2
Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel"

This reverts commit ddacf5ef684a655abe2bb50c4b2a5b72ae0d5e05.

We piggyback on upstream git commit 12275dd4b747f5d87fa36229774d76bca8e63068
which says:

commit 12275dd4b747f5d87fa36229774d76bca8e63068
Author: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date:   Mon Dec 19 09:30:35 2011 -0500

    Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel"

    This reverts commit ddacf5ef684a655abe2bb50c4b2a5b72ae0d5e05.
    As when booting the kernel under Amazon EC2 as an HVM guest it ends up
    hanging during startup. Reverting this we loose the fix for kexec
    booting to the crash kernels.

    Fixes Canonical BZ #901305 (http://bugs.launchpad.net/bugs/901305)

Tested-by: Alessandro Salvatori <sandr8@gmail.com>
Reported-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Ian Campbell <Ian.Campbell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
drivers/xen/xenbus/xenbus_xs.c
include/xen/interface/io/xs_wire.h