From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Sun, 21 Jul 2013 15:17:54 +0000 (+0000)
Subject: xen/arm,arm64: update xen_restart after ff701306cd49 and 7b6d864b48d9
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~10448^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2451ade070ef9b0a0f118ac41896da856e72b5a1;p=mirror_ubuntu-zesty-kernel.git

xen/arm,arm64: update xen_restart after ff701306cd49 and 7b6d864b48d9

Commit 7b6d864b48d9 (reboot: arm: change reboot_mode to use enum
reboot_mode) and ff701306cd49 (arm64: use common reboot infrastructure)
change the prototype of arm_pm_restart on arm and arm64.
Update xen_restart accordingly.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---

diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index f71c37edca26..c9770ba5c7df 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;