diff options
Diffstat (limited to 'arch/x86/xen')
-rw-r--r-- | arch/x86/xen/enlighten.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 446f4cd649e6..35ddaf50180a 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -254,7 +254,7 @@ static void xen_irq_enable(void) | |||
254 | static void xen_safe_halt(void) | 254 | static void xen_safe_halt(void) |
255 | { | 255 | { |
256 | /* Blocking includes an implicit local_irq_enable(). */ | 256 | /* Blocking includes an implicit local_irq_enable(). */ |
257 | if (HYPERVISOR_sched_op(SCHEDOP_block, 0) != 0) | 257 | if (HYPERVISOR_sched_op(SCHEDOP_block, NULL) != 0) |
258 | BUG(); | 258 | BUG(); |
259 | } | 259 | } |
260 | 260 | ||
@@ -1138,11 +1138,13 @@ static const struct smp_ops xen_smp_ops __initdata = { | |||
1138 | 1138 | ||
1139 | static void xen_reboot(int reason) | 1139 | static void xen_reboot(int reason) |
1140 | { | 1140 | { |
1141 | struct sched_shutdown r = { .reason = reason }; | ||
1142 | |||
1141 | #ifdef CONFIG_SMP | 1143 | #ifdef CONFIG_SMP |
1142 | smp_send_stop(); | 1144 | smp_send_stop(); |
1143 | #endif | 1145 | #endif |
1144 | 1146 | ||
1145 | if (HYPERVISOR_sched_op(SCHEDOP_shutdown, reason)) | 1147 | if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r)) |
1146 | BUG(); | 1148 | BUG(); |
1147 | } | 1149 | } |
1148 | 1150 | ||