ia64/xen-unstable

changeset 7657:b547291cb6d4

Missed ia64 changes to one drivers/xen file
author djm@kirby.fc.hp.com
date Mon Nov 07 11:25:59 2005 -0600 (2005-11-07)
parents b6cce4237ded
children d51b071bfcfc
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	Mon Nov 07 11:13:38 2005 -0600
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Mon Nov 07 11:25:59 2005 -0600
     1.3 @@ -181,6 +181,15 @@ static int privcmd_ioctl(struct inode *i
     1.4  		for (i = 0; i < m.num; i++, addr += PAGE_SIZE, p++) {
     1.5  			if (get_user(mfn, p))
     1.6  				return -EFAULT;
     1.7 +#ifdef __ia64__
     1.8 +			ret = remap_pfn_range(vma,
     1.9 +					      addr&PAGE_MASK,
    1.10 +					      mfn,
    1.11 +					      1<<PAGE_SHIFT,
    1.12 +					      vma->vm_page_prot);
    1.13 +			if (ret < 0)
    1.14 +			    goto batch_err;
    1.15 +#else
    1.16  
    1.17  			ret = create_lookup_pte_addr(vma->vm_mm, addr, &ptep);
    1.18  			if (ret)
    1.19 @@ -191,6 +200,7 @@ static int privcmd_ioctl(struct inode *i
    1.20  
    1.21  			if (HYPERVISOR_mmu_update(&u, 1, NULL, m.dom) < 0)
    1.22  				put_user(0xF0000000 | mfn, p);
    1.23 +#endif
    1.24  		}
    1.25  
    1.26  		ret = 0;
    1.27 @@ -206,6 +216,7 @@ static int privcmd_ioctl(struct inode *i
    1.28  	break;
    1.29  #endif
    1.30  
    1.31 +#ifndef __ia64__
    1.32  	case IOCTL_PRIVCMD_GET_MACH2PHYS_START_MFN: {
    1.33  		unsigned long m2pv = (unsigned long)machine_to_phys_mapping;
    1.34  		pgd_t *pgd = pgd_offset_k(m2pv);
    1.35 @@ -217,6 +228,7 @@ static int privcmd_ioctl(struct inode *i
    1.36  			-EFAULT: 0;
    1.37  	}
    1.38  	break;
    1.39 +#endif
    1.40  
    1.41  	default:
    1.42  		ret = -EINVAL;