# HG changeset patch # User yamahata@xxxxxxxxxxxxx # Node ID 5b5f068711f8907a9849e7af643aa3d4cd9db41b # Parent 052e3c8407a647d6ccb07fff7ff0787744216162 add read only mapping support. PATCHNAME: read_only_mapping_linux Signed-off-by: Isaku Yamahata diff -r 052e3c8407a6 -r 5b5f068711f8 linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c --- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c Fri May 19 16:57:16 2006 +0900 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c Fri May 19 16:57:18 2006 +0900 @@ -314,12 +314,6 @@ gnttab_map_grant_ref_pre(struct gnttab_m uint32_t flags; flags = uop->flags; - if (flags & GNTMAP_readonly) { -#if 0 - xprintd("GNTMAP_readonly is not supported yet\n"); -#endif - flags &= ~GNTMAP_readonly; - } if (flags & GNTMAP_host_map) { if (flags & GNTMAP_application_map) { @@ -518,6 +512,7 @@ xen_ia64_privcmd_entry_mmap(struct vm_ar int error = 0; struct xen_ia64_privcmd_entry* entry = &privcmd_range->entries[i]; unsigned long gpfn; + unsigned long flags; BUG_ON((addr & ~PAGE_MASK) != 0); BUG_ON(mfn == INVALID_MFN); @@ -528,8 +523,11 @@ xen_ia64_privcmd_entry_mmap(struct vm_ar } gpfn = (privcmd_range->res->start >> PAGE_SHIFT) + i; - error = HYPERVISOR_add_physmap(gpfn, mfn, 0/* prot:XXX */, - domid); + flags = _PAGE_AR_RWX; + if (pgprot_val(prot) == PROT_READ) { + flags = _PAGE_AR_R; + } + error = HYPERVISOR_add_physmap(gpfn, mfn, flags, domid); if (error != 0) { goto out; } diff -r 052e3c8407a6 -r 5b5f068711f8 linux-2.6-xen-sparse/include/asm-ia64/hypercall.h --- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h Fri May 19 16:57:16 2006 +0900 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h Fri May 19 16:57:18 2006 +0900 @@ -481,7 +481,7 @@ HYPERVISOR_zap_physmap(unsigned long gpf static inline unsigned long __HYPERVISOR_add_physmap(unsigned long gpfn, unsigned long mfn, - unsigned int flags, domid_t domid) + unsigned long flags, domid_t domid) { return _hypercall_imm4(unsigned long, ia64_dom0vp_op, IA64_DOM0VP_add_physmap, gpfn, mfn, flags, @@ -490,7 +490,7 @@ __HYPERVISOR_add_physmap(unsigned long g static inline unsigned long HYPERVISOR_add_physmap(unsigned long gpfn, unsigned long mfn, - unsigned int flags, domid_t domid) + unsigned long flags, domid_t domid) { unsigned long ret = 0; BUG_ON(!running_on_xen);//XXX