Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+1 -1
+1 -1
arch/arm/xen/enlighten.c
··· 172 172 enable_percpu_irq(xen_events_irq, 0); 173 173 } 174 174 175 - static void xen_restart(char str, const char *cmd) 175 + static void xen_restart(enum reboot_mode reboot_mode, const char *cmd) 176 176 { 177 177 struct sched_shutdown r = { .reason = SHUTDOWN_reboot }; 178 178 int rc;