Commit 349c709f authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Thomas Gleixner
Browse files

xen: use new sched_op 



Use the new sched_op hypercall, mainly because xenner doesn't support
the old one.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7b1333aa

arch/x86/xen/enlighten.c

+4 −2
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static void xen_irq_enable(void) 
static void xen_safe_halt(void)

{

	/* Blocking includes an implicit local_irq_enable(). */

	if (HYPERVISOR_sched_op(SCHEDOP_block, 0) != 0)

	if (HYPERVISOR_sched_op(SCHEDOP_block, NULL) != 0)

		BUG();

}
@@ -1138,11 +1138,13 @@ static const struct smp_ops xen_smp_ops __initdata = { 


static void xen_reboot(int reason)

{

	struct sched_shutdown r = { .reason = reason };



#ifdef CONFIG_SMP

	smp_send_stop();

#endif



	if (HYPERVISOR_sched_op(SCHEDOP_shutdown, reason))

	if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))

		BUG();

}

include/asm-x86/xen/hypercall.h

+2 −2
Original line number Diff line number Diff line
@@ -176,9 +176,9 @@ HYPERVISOR_fpu_taskswitch(int set) 
}



static inline int

HYPERVISOR_sched_op(int cmd, unsigned long arg)

HYPERVISOR_sched_op(int cmd, void *arg)

{

	return _hypercall2(int, sched_op, cmd, arg);

	return _hypercall2(int, sched_op_new, cmd, arg);

}



static inline long