ia64/xen-unstable

changeset 10170:2436cc71de50

Remove unnecessary x86-specific mapping code from privcmd interface.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed May 24 14:49:24 2006 +0100 (2006-05-24)
parents 041127f2c687
children ad33b3882867
files linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Wed May 24 14:24:57 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Wed May 24 14:49:24 2006 +0100
     1.3 @@ -159,10 +159,6 @@ static int privcmd_ioctl(struct inode *i
     1.4  	break;
     1.5  
     1.6  	case IOCTL_PRIVCMD_MMAPBATCH: {
     1.7 -#ifndef __ia64__
     1.8 -		mmu_update_t u;
     1.9 -		uint64_t ptep;
    1.10 -#endif
    1.11  		privcmd_mmapbatch_t m;
    1.12  		struct vm_area_struct *vma = NULL;
    1.13  		unsigned long __user *p;
    1.14 @@ -200,24 +196,12 @@ static int privcmd_ioctl(struct inode *i
    1.15  		for (i = 0; i < m.num; i++, addr += PAGE_SIZE, p++) {
    1.16  			if (get_user(mfn, p))
    1.17  				return -EFAULT;
    1.18 -#ifdef __ia64__
    1.19 +
    1.20  			ret = direct_remap_pfn_range(vma, addr & PAGE_MASK,
    1.21 -						     mfn, 1 << PAGE_SHIFT,
    1.22 +						     mfn, PAGE_SIZE,
    1.23  						     vma->vm_page_prot, m.dom);
    1.24  			if (ret < 0)
    1.25 -			    goto batch_err;
    1.26 -#else
    1.27 -
    1.28 -			ret = create_lookup_pte_addr(vma->vm_mm, addr, &ptep);
    1.29 -			if (ret)
    1.30 -				goto batch_err;
    1.31 -
    1.32 -			u.val = pte_val_ma(pfn_pte_ma(mfn, vma->vm_page_prot));
    1.33 -			u.ptr = ptep;
    1.34 -
    1.35 -			if (HYPERVISOR_mmu_update(&u, 1, NULL, m.dom) < 0)
    1.36  				put_user(0xF0000000 | mfn, p);
    1.37 -#endif
    1.38  		}
    1.39  
    1.40  		ret = 0;