Commit 878d2cd6 authored by Linus Torvalds's avatar Linus Torvalds

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

Merge tag 'xen-arm-3.11-rc2-warn-tag' of git://

Pull Xen ARM fix from Stefano Stabellini.

Update xen_restart to new calling convention.

* tag 'xen-arm-3.11-rc2-warn-tag' of git://
  xen/arm,arm64: update xen_restart after ff701306 and 7b6d864b
parents 3132be9a 2451ade0
......@@ -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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment