diff -r 38053f970436 xen/common/kernel.c
--- a/xen/common/kernel.c	Wed Jul 18 08:46:49 2007 -0500
+++ b/xen/common/kernel.c	Thu Jul 19 02:54:02 2007 -0500
@@ -10,7 +10,6 @@
 #include <xen/errno.h>
 #include <xen/version.h>
 #include <xen/sched.h>
-#include <xen/shadow.h>
 #include <xen/nmi.h>
 #include <xen/guest_access.h>
 #include <asm/current.h>
@@ -217,7 +216,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL
             fi.submap = 0;
             if ( VM_ASSIST(d, VMASST_TYPE_pae_extended_cr3) )
                 fi.submap |= (1U << XENFEAT_pae_pgdir_above_4gb);
-            if ( shadow_mode_translate(current->domain) )
+            if ( paging_mode_translate(current->domain) )
                 fi.submap |= 
                     (1U << XENFEAT_writable_page_tables) |
                     (1U << XENFEAT_auto_translated_physmap);
diff -r 38053f970436 xen/arch/x86/mm/hap/hap.c
--- a/xen/arch/x86/mm/hap/hap.c	Wed Jul 18 08:46:49 2007 -0500
+++ b/xen/arch/x86/mm/hap/hap.c	Thu Jul 19 02:54:02 2007 -0500
@@ -463,7 +463,7 @@ int hap_enable(struct domain *d, u32 mod
             goto out;
     }
 
-    d->arch.paging.mode = mode | PG_SH_enable;
+    d->arch.paging.mode = mode | PG_HAP_enable;
 
  out:
     domain_unpause(d);
diff -r 38053f970436 xen/common/memory.c
--- a/xen/common/memory.c	Wed Jul 18 08:46:49 2007 -0500
+++ b/xen/common/memory.c	Thu Jul 19 02:54:02 2007 -0500
@@ -14,7 +14,6 @@
 #include <xen/perfc.h>
 #include <xen/sched.h>
 #include <xen/event.h>
-#include <xen/shadow.h>
 #include <xen/iocap.h>
 #include <xen/guest_access.h>
 #include <xen/hypercall.h>
@@ -127,7 +126,7 @@ static void populate_physmap(struct memo
 
         mfn = page_to_mfn(page);
 
-        if ( unlikely(shadow_mode_translate(d)) )
+        if ( unlikely(paging_mode_translate(d)) )
         {
             for ( j = 0; j < (1 << a->extent_order); j++ )
                 guest_physmap_add_page(d, gpfn + j, mfn + j);
@@ -236,7 +235,7 @@ static long translate_gpfn_list(
     if ( (d = rcu_lock_domain_by_id(op.domid)) == NULL )
         return -ESRCH;
 
-    if ( !shadow_mode_translate(d) )
+    if ( !paging_mode_translate(d) )
     {
         rcu_unlock_domain(d);
         return -EINVAL;
@@ -434,7 +433,7 @@ static long memory_exchange(XEN_GUEST_HA
                 &gpfn, exch.out.extent_start, (i<<out_chunk_order)+j, 1);
 
             mfn = page_to_mfn(page);
-            if ( unlikely(shadow_mode_translate(d)) )
+            if ( unlikely(paging_mode_translate(d)) )
             {
                 for ( k = 0; k < (1UL << exch.out.extent_order); k++ )
                     guest_physmap_add_page(d, gpfn + k, mfn + k);