diff -r 5c61cd349b20 arch/i386/kernel/fixup.c
--- a/arch/i386/kernel/fixup.c	Thu Feb 07 10:33:19 2008 +0000
+++ b/arch/i386/kernel/fixup.c	Fri Feb 08 15:03:26 2008 -0500
@@ -46,7 +46,7 @@ fastcall void do_fixup_4gb_segment(struc
 	if (current->tgid == 1)
 		return;
             
-	VOID(HYPERVISOR_vm_assist(VMASST_CMD_disable,
+	XEN_VOID(HYPERVISOR_vm_assist(VMASST_CMD_disable,
 				  VMASST_TYPE_4gb_segments_notify));
 
 	if (test_and_set_bit(0, &printed))
diff -r 5c61cd349b20 arch/i386/kernel/io_apic-xen.c
--- a/arch/i386/kernel/io_apic-xen.c	Thu Feb 07 10:33:19 2008 +0000
+++ b/arch/i386/kernel/io_apic-xen.c	Fri Feb 08 15:03:21 2008 -0500
@@ -2506,7 +2506,7 @@ static int __init io_apic_bug_finalize(v
 		struct xen_platform_op op = { .cmd = XENPF_platform_quirk };
 		op.u.platform_quirk.quirk_id = sis_apic_bug ?
 			QUIRK_IOAPIC_BAD_REGSEL : QUIRK_IOAPIC_GOOD_REGSEL;
-		VOID(HYPERVISOR_platform_op(&op));
+		XEN_VOID(HYPERVISOR_platform_op(&op));
 	}
 	return 0;
 }
diff -r 5c61cd349b20 arch/i386/kernel/process-xen.c
--- a/arch/i386/kernel/process-xen.c	Thu Feb 07 10:33:19 2008 +0000
+++ b/arch/i386/kernel/process-xen.c	Fri Feb 08 15:03:17 2008 -0500
@@ -138,7 +138,7 @@ static inline void play_dead(void)
 	local_irq_disable();
 	cpu_clear(smp_processor_id(), cpu_initialized);
 	preempt_enable_no_resched();
-	VOID(HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL));
+	XEN_VOID(HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL));
 	cpu_bringup();
 }
 #else
diff -r 5c61cd349b20 arch/i386/kernel/time-xen.c
--- a/arch/i386/kernel/time-xen.c	Thu Feb 07 10:33:19 2008 +0000
+++ b/arch/i386/kernel/time-xen.c	Fri Feb 08 15:03:05 2008 -0500
@@ -1034,7 +1034,7 @@ void halt(void)
 void halt(void)
 {
 	if (irqs_disabled())
-		VOID(HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL));
+		XEN_VOID(HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL));
 }
 EXPORT_SYMBOL(halt);
 
diff -r 5c61cd349b20 arch/x86_64/kernel/process-xen.c
--- a/arch/x86_64/kernel/process-xen.c	Thu Feb 07 10:33:19 2008 +0000
+++ b/arch/x86_64/kernel/process-xen.c	Fri Feb 08 15:03:57 2008 -0500
@@ -152,7 +152,7 @@ static inline void play_dead(void)
 	local_irq_disable();
 	cpu_clear(smp_processor_id(), cpu_initialized);
 	preempt_enable_no_resched();
-	VOID(HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL));
+	XEN_VOID(HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL));
 	cpu_bringup();
 }
 #else
diff -r 5c61cd349b20 drivers/xen/core/evtchn.c
--- a/drivers/xen/core/evtchn.c	Thu Feb 07 10:33:19 2008 +0000
+++ b/drivers/xen/core/evtchn.c	Fri Feb 08 15:04:37 2008 -0500
@@ -215,7 +215,7 @@ static inline void exit_idle(void) {}
  */
 void force_evtchn_callback(void)
 {
-	VOID(HYPERVISOR_xen_version(0, NULL));
+	XEN_VOID(HYPERVISOR_xen_version(0, NULL));
 }
 /* Not a GPL symbol: used in ubiquitous macros, so too restrictive. */
 EXPORT_SYMBOL(force_evtchn_callback);
@@ -749,7 +749,7 @@ static inline void pirq_unmask_notify(in
 {
 	struct physdev_eoi eoi = { .irq = pirq };
 	if (unlikely(test_bit(pirq, pirq_needs_eoi)))
-		VOID(HYPERVISOR_physdev_op(PHYSDEVOP_eoi, &eoi));
+		XEN_VOID(HYPERVISOR_physdev_op(PHYSDEVOP_eoi, &eoi));
 }
 
 static inline void pirq_query_unmask(int pirq)
@@ -913,7 +913,7 @@ void unmask_evtchn(int port)
 	/* Slow path (hypercall) if this is a non-local port. */
 	if (unlikely(cpu != cpu_from_evtchn(port))) {
 		struct evtchn_unmask unmask = { .port = port };
-		VOID(HYPERVISOR_event_channel_op(EVTCHNOP_unmask, &unmask));
+		XEN_VOID(HYPERVISOR_event_channel_op(EVTCHNOP_unmask, &unmask));
 		return;
 	}
 
diff -r 5c61cd349b20 drivers/xen/core/machine_kexec.c
--- a/drivers/xen/core/machine_kexec.c	Thu Feb 07 10:33:19 2008 +0000
+++ b/drivers/xen/core/machine_kexec.c	Fri Feb 08 15:05:50 2008 -0500
@@ -168,7 +168,7 @@ NORET_TYPE void machine_kexec(struct kim
 
 	memset(&xke, 0, sizeof(xke));
 	xke.type = image->type;
-	VOID(HYPERVISOR_kexec_op(KEXEC_CMD_kexec, &xke));
+	XEN_VOID(HYPERVISOR_kexec_op(KEXEC_CMD_kexec, &xke));
 	panic("KEXEC_CMD_kexec hypercall should not return\n");
 }
 
diff -r 5c61cd349b20 include/asm-i386/mach-xen/asm/hypervisor.h
--- a/include/asm-i386/mach-xen/asm/hypervisor.h	Thu Feb 07 10:33:19 2008 +0000
+++ b/include/asm-i386/mach-xen/asm/hypervisor.h	Fri Feb 08 15:04:58 2008 -0500
@@ -188,9 +188,9 @@ HYPERVISOR_shutdown(
 		.reason = reason
 	};
 
-	VOID(HYPERVISOR_sched_op(SCHEDOP_shutdown, &sched_shutdown));
-#if CONFIG_XEN_COMPAT <= 0x030002
-	VOID(HYPERVISOR_sched_op_compat(SCHEDOP_shutdown, reason));
+	XEN_VOID(HYPERVISOR_sched_op(SCHEDOP_shutdown, &sched_shutdown));
+#if CONFIG_XEN_COMPAT <= 0x030002
+	XEN_VOID(HYPERVISOR_sched_op_compat(SCHEDOP_shutdown, reason));
 #endif
 	/* Don't recurse needlessly. */
 	BUG_ON(reason != SHUTDOWN_crash);
diff -r 5c61cd349b20 include/xen/evtchn.h
--- a/include/xen/evtchn.h	Thu Feb 07 10:33:19 2008 +0000
+++ b/include/xen/evtchn.h	Fri Feb 08 15:05:10 2008 -0500
@@ -126,7 +126,7 @@ static inline void notify_remote_via_evt
 static inline void notify_remote_via_evtchn(int port)
 {
 	struct evtchn_send send = { .port = port };
-	VOID(HYPERVISOR_event_channel_op(EVTCHNOP_send, &send));
+	XEN_VOID(HYPERVISOR_event_channel_op(EVTCHNOP_send, &send));
 }
 
 /*
diff -r 5c61cd349b20 include/xen/hypercall.h
--- a/include/xen/hypercall.h	Thu Feb 07 10:33:19 2008 +0000
+++ b/include/xen/hypercall.h	Fri Feb 08 15:05:22 2008 -0500
@@ -25,6 +25,6 @@ HYPERVISOR_multicall_check(
 /* A construct to ignore the return value of hypercall wrappers in a few
  * exceptional cases (simply casting the function result to void doesn't
  * avoid the compiler warning): */
-#define VOID(expr) ((void)((expr)?:0))
+#define XEN_VOID(expr) ((void)((expr)?:0))
 
 #endif /* __XEN_HYPERCALL_H__ */