diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-06-24 09:37:54 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-06-24 09:37:54 +0000 |
| commit | 5f2c0a19bfe0920261cb37b52916ab424bf9c9ed (patch) | |
| tree | 1c3d7669e07064c1fc4bc31bc56c93b890f84b67 | |
| parent | c2533bd68dbc7f00ec0d8ba5eb0bee57dfc2ebeb (diff) | |
| download | xen-5f2c0a19bfe0920261cb37b52916ab424bf9c9ed.tar.gz xen-5f2c0a19bfe0920261cb37b52916ab424bf9c9ed.tar.bz2 xen-5f2c0a19bfe0920261cb37b52916ab424bf9c9ed.zip | |
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>
5 files changed, 9 insertions, 5 deletions
diff --git a/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c b/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c index 46d55d1fd4..f6bf04fe5b 100644 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c @@ -174,7 +174,7 @@ void blkif_connect(blkif_be_connect_t *connect) return; } - prot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED); + prot = __pgprot(_KERNPG_TABLE); error = direct_remap_area_pages(&init_mm, VMALLOC_VMADDR(vma->addr), shmem_frame<<PAGE_SHIFT, PAGE_SIZE, prot, domid); diff --git a/linux-2.6.11-xen-sparse/drivers/xen/netback/interface.c b/linux-2.6.11-xen-sparse/drivers/xen/netback/interface.c index 98c6cfa98b..e7d918124d 100644 --- a/linux-2.6.11-xen-sparse/drivers/xen/netback/interface.c +++ b/linux-2.6.11-xen-sparse/drivers/xen/netback/interface.c @@ -300,7 +300,7 @@ void netif_connect(netif_be_connect_t *connect) return; } - prot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED); + prot = __pgprot(_KERNPG_TABLE); error = direct_remap_area_pages(&init_mm, VMALLOC_VMADDR(vma->addr), tx_shmem_frame<<PAGE_SHIFT, PAGE_SIZE, diff --git a/linux-2.6.11-xen-sparse/drivers/xen/usbback/interface.c b/linux-2.6.11-xen-sparse/drivers/xen/usbback/interface.c index c1a16e8000..edca62bba5 100644 --- a/linux-2.6.11-xen-sparse/drivers/xen/usbback/interface.c +++ b/linux-2.6.11-xen-sparse/drivers/xen/usbback/interface.c @@ -170,7 +170,7 @@ void usbif_connect(usbif_be_connect_t *connect) return; } - prot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED); + prot = __pgprot(_KERNPG_TABLE); error = direct_remap_area_pages(&init_mm, VMALLOC_VMADDR(vma->addr), shmem_frame<<PAGE_SHIFT, PAGE_SIZE, prot, domid); diff --git a/linux-2.6.11-xen-sparse/drivers/xen/usbback/usbback.c b/linux-2.6.11-xen-sparse/drivers/xen/usbback/usbback.c index 0a4cf8b4ea..ac73bd0f2f 100644 --- a/linux-2.6.11-xen-sparse/drivers/xen/usbback/usbback.c +++ b/linux-2.6.11-xen-sparse/drivers/xen/usbback/usbback.c @@ -646,7 +646,7 @@ static void dispatch_usb_io(usbif_priv_t *up, usbif_request_t *req) ASSERT(buffer_mach); /* Always map writeable for now. */ - remap_prot = _PAGE_PRESENT|_PAGE_DIRTY|_PAGE_ACCESSED|_PAGE_RW; + remap_prot = _KERNPG_TABLE; for ( i = 0, offset = 0; offset < req->length; i++, offset += PAGE_SIZE ) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 9e7b7223e9..2afdbca0bf 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -258,7 +258,11 @@ __gnttab_activate_grant_ref( { /* Write update into the pagetable. */ l1_pgentry_t pte; - pte = l1e_from_pfn(frame, _PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_DIRTY); + pte = l1e_from_pfn(frame, _PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_DIRTY +#if defined(__x86_64__) + | _PAGE_USER +#endif + ); if ( !(dev_hst_ro_flags & GNTMAP_readonly) ) l1e_add_flags(pte,_PAGE_RW); rc = update_grant_va_mapping( host_virt_addr, pte, |