Xen devel - Jul 2013 - [PATCH v2] xen/arm and xen/arm64: update xen_restart after ff701306cd49

Commit ff701306cd49 (arm64: use common reboot infrastructure) changes
the prototype of arm_pm_restart.  Update xen_restart accordingly.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
 arch/arm/xen/enlighten.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index f71c37e..c9770ba 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -172,7 +172,7 @@ static void __init xen_percpu_init(void *unused)
 	enable_percpu_irq(xen_events_irq, 0);
 }
 
-static void xen_restart(char str, const char *cmd)
+static void xen_restart(enum reboot_mode reboot_mode, const char *cmd)
 {
 	struct sched_shutdown r = { .reason = SHUTDOWN_reboot };
 	int rc;
-- 
1.7.2.5

On Mon, Jul 22, 2013 at 10:47:44AM +0100, Stefano Stabellini
wrote:
> Commit ff701306cd49 (arm64: use common reboot infrastructure) changes
> the prototype of arm_pm_restart.  Update xen_restart accordingly.
> 
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
You may even want to quote 7b6d864b48d9 (reboot: arm: change reboot_mode
to use enum reboot_mode) since you are changing a file under arch/arm ;)

-- 
Catalin