ia64/xen-unstable

changeset 5574:75ab24f43793

bitkeeper revision 1.1748.1.3 (42bbd472VxKIpvOzuAFDfVAi9gXwDA)

With this patch, now x86_64 domU is fully up!

We are running LTP there now.

Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
Signed-off-by: Xiaofeng Ling <xiaofeng.ling@intel.com>
Signed-off-by: Xin B Li <xin.b.li@intel.com>
author kaf24@firebug.cl.cam.ac.uk
date Fri Jun 24 09:37:54 2005 +0000 (2005-06-24)
parents 09771c771f7a
children 200f5dfe9647
files linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c linux-2.6.11-xen-sparse/drivers/xen/netback/interface.c linux-2.6.11-xen-sparse/drivers/xen/usbback/interface.c linux-2.6.11-xen-sparse/drivers/xen/usbback/usbback.c xen/common/grant_table.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c	Fri Jun 24 09:28:11 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c	Fri Jun 24 09:37:54 2005 +0000
     1.3 @@ -174,7 +174,7 @@ void blkif_connect(blkif_be_connect_t *c
     1.4          return;
     1.5      }
     1.6  
     1.7 -    prot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED);
     1.8 +    prot = __pgprot(_KERNPG_TABLE);
     1.9      error = direct_remap_area_pages(&init_mm, VMALLOC_VMADDR(vma->addr),
    1.10                                      shmem_frame<<PAGE_SHIFT, PAGE_SIZE,
    1.11                                      prot, domid);
     2.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/netback/interface.c	Fri Jun 24 09:28:11 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/netback/interface.c	Fri Jun 24 09:37:54 2005 +0000
     2.3 @@ -300,7 +300,7 @@ void netif_connect(netif_be_connect_t *c
     2.4          return;
     2.5      }
     2.6  
     2.7 -    prot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED);
     2.8 +    prot = __pgprot(_KERNPG_TABLE);
     2.9      error  = direct_remap_area_pages(&init_mm, 
    2.10                                       VMALLOC_VMADDR(vma->addr),
    2.11                                       tx_shmem_frame<<PAGE_SHIFT, PAGE_SIZE,
     3.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/usbback/interface.c	Fri Jun 24 09:28:11 2005 +0000
     3.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/usbback/interface.c	Fri Jun 24 09:37:54 2005 +0000
     3.3 @@ -170,7 +170,7 @@ void usbif_connect(usbif_be_connect_t *c
     3.4          return;
     3.5      }
     3.6  
     3.7 -    prot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED);
     3.8 +    prot = __pgprot(_KERNPG_TABLE);
     3.9      error = direct_remap_area_pages(&init_mm, VMALLOC_VMADDR(vma->addr),
    3.10                                      shmem_frame<<PAGE_SHIFT, PAGE_SIZE,
    3.11                                      prot, domid);
     4.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/usbback/usbback.c	Fri Jun 24 09:28:11 2005 +0000
     4.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/usbback/usbback.c	Fri Jun 24 09:37:54 2005 +0000
     4.3 @@ -646,7 +646,7 @@ static void dispatch_usb_io(usbif_priv_t
     4.4      ASSERT(buffer_mach);
     4.5  
     4.6      /* Always map writeable for now. */
     4.7 -    remap_prot = _PAGE_PRESENT|_PAGE_DIRTY|_PAGE_ACCESSED|_PAGE_RW;
     4.8 +    remap_prot = _KERNPG_TABLE;
     4.9  
    4.10      for ( i = 0, offset = 0; offset < req->length;
    4.11            i++, offset += PAGE_SIZE )
     5.1 --- a/xen/common/grant_table.c	Fri Jun 24 09:28:11 2005 +0000
     5.2 +++ b/xen/common/grant_table.c	Fri Jun 24 09:37:54 2005 +0000
     5.3 @@ -258,7 +258,11 @@ static int
     5.4      {
     5.5          /* Write update into the pagetable. */
     5.6          l1_pgentry_t pte;
     5.7 -        pte = l1e_from_pfn(frame, _PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_DIRTY);
     5.8 +        pte = l1e_from_pfn(frame, _PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_DIRTY
     5.9 +#if defined(__x86_64__)
    5.10 +            | _PAGE_USER               
    5.11 +#endif
    5.12 +            );
    5.13          if ( !(dev_hst_ro_flags & GNTMAP_readonly) )
    5.14              l1e_add_flags(pte,_PAGE_RW);
    5.15          rc = update_grant_va_mapping( host_virt_addr, pte,