Commit 878d2cd6 authored Jul 31, 2013 by Linus Torvalds

Merge tag 'xen-arm-3.11-rc2-warn-tag' of...

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 ff701306 and 7b6d864b

parents 3132be9a 2451ade0

arch/arm/xen/enlighten.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;