# HG changeset patch
# User Tristan Gingold <tgingold@xxxxxxx>
# Date 1191331494 -7200
# Node ID d4c384228c9bac8499bcec4a35271229e10412d5
# Parent  5d8b23081846748848409d7b1577ad00a85fabe7
Reduce size of arch_vmx_struct (flags is now 1 byte).
Remove unused macro.
Add VMX_MMU_MODE macro.

Signed-off-by: Tristan Gingold <tgingold@xxxxxxx>

diff -r 5d8b23081846 -r d4c384228c9b xen/include/asm-ia64/vmx_phy_mode.h
--- a/xen/include/asm-ia64/vmx_phy_mode.h	Tue Oct 02 15:21:53 2007 +0200
+++ b/xen/include/asm-ia64/vmx_phy_mode.h	Tue Oct 02 15:24:54 2007 +0200
@@ -86,7 +86,8 @@ extern void vmx_load_all_rr(VCPU *vcpu);
 extern void vmx_load_all_rr(VCPU *vcpu);
 extern void physical_tlb_miss(VCPU *vcpu, u64 vadr, int type);
 
-#define is_virtual_mode(v)     ((v)->arch.arch_vmx.mmu_mode == VMX_MMU_VIRTUAL)
+#define VMX_MMU_MODE(v)		((v)->arch.arch_vmx.mmu_mode)
+#define is_virtual_mode(v)  (VMX_MMU_MODE(v) == VMX_MMU_VIRTUAL)
 
 #endif /* __ASSEMBLY__ */
 
diff -r 5d8b23081846 -r d4c384228c9b xen/include/asm-ia64/vmx_vpd.h
--- a/xen/include/asm-ia64/vmx_vpd.h	Tue Oct 02 15:21:53 2007 +0200
+++ b/xen/include/asm-ia64/vmx_vpd.h	Tue Oct 02 15:24:54 2007 +0200
@@ -55,8 +55,8 @@ struct arch_vmx_struct {
     unsigned long   cause;
     unsigned long   opcode;
     unsigned long   mpta;
-    unsigned long   flags;
     unsigned long   xen_port;
+    unsigned char   flags;
     unsigned char   xtp;
     unsigned char   pal_init_pending;
     unsigned char   mmu_mode; /* Current mmu mode.  See vmx_phy_mode.h  */
@@ -68,8 +68,7 @@ struct arch_vmx_struct {
 
 #define VMX_DOMAIN(v)   v->arch.arch_vmx.flags
 
-#define ARCH_VMX_IO_WAIT        3       /* Waiting for I/O completion */
-#define ARCH_VMX_DOMAIN         5       /* Need it to indicate VTi domain */
+#define ARCH_VMX_DOMAIN         0       /* Need it to indicate VTi domain */
 
 #endif //__ASSEMBLY__