--- include/asm-i386/lguest.h~	2007-08-20 11:51:05.000000000 +0200
+++ include/asm-i386/lguest.h	2007-08-20 13:19:34.000000000 +0200
@@ -8,6 +8,7 @@
 
 #ifndef __ASSEMBLY__
 #include <asm/desc.h>
+#include <asm/lguest_hcall.h>
 
 #define LGUEST_SWITCHER_NEEDS_MAPPING	1
 
@@ -26,7 +27,12 @@
 struct lguest_regs
 {
 	/* Manually saved part. */
-	unsigned long eax, ebx, ecx, edx;
+	union {
+		struct hcall_args hcall_args;
+		struct {
+			unsigned long eax, ebx, ecx, edx;
+		} x;
+	};
 	unsigned long esi, edi, ebp;
 	unsigned long gs;
 	unsigned long fs, ds, es;
@@ -74,7 +80,6 @@
 	if (!(cr0 & 8))
 		write_cr0(cr0|8);
 }
-
 #endif /* __ASSEMBLY__ */
 
 #endif