summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-31 11:34:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-31 11:34:56 -0700
commit878d2cd6738f65907da0136325e4060b2d2ece14 (patch)
tree85e70152793ca0fce8441c93e36adbf6d25d76d7 /arch
parent3132be9aefc6c7edd42156a35cc2a2134d154f5d (diff)
parent2451ade070ef9b0a0f118ac41896da856e72b5a1 (diff)
downloadlinux-878d2cd6738f65907da0136325e4060b2d2ece14.tar.bz2
Merge tag 'xen-arm-3.11-rc2-warn-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen
Pull Xen ARM fix from Stefano Stabellini. Update xen_restart to new calling convention. * tag 'xen-arm-3.11-rc2-warn-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen: xen/arm,arm64: update xen_restart after ff701306cd49 and 7b6d864b48d9
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/xen/enlighten.c2
1 files changed, 1 insertions, 1 deletions
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;