ia64/xen-unstable

changeset 551:46cafc527365

bitkeeper revision 1.306 (3f0ade01zzZKmrmswpUSMGtDKNYM-A)

Finish merginf with Keir.
author sos22@labyrinth.cl.cam.ac.uk
date Tue Jul 08 15:06:41 2003 +0000 (2003-07-08)
parents 7ddc307ecc6a
children e923951ada95
files xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_memory.c
line diff
     1.1 --- a/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c	Tue Jul 08 14:47:05 2003 +0000
     1.2 +++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_core.c	Tue Jul 08 15:06:41 2003 +0000
     1.3 @@ -46,7 +46,7 @@ static struct proc_dir_entry *dom0_cmd_i
     1.4  static struct proc_dir_entry *dom_list_intf;
     1.5  
     1.6  unsigned long direct_mmap(unsigned long, unsigned long, pgprot_t, int);
     1.7 -int direct_unmap(unsigned long, unsigned long);
     1.8 +int direct_unmap(struct mm_struct *, unsigned long, unsigned long);
     1.9  
    1.10  static ssize_t dom_usage_read(struct file * file, char * buff, size_t size, loff_t * off)
    1.11  {
    1.12 @@ -339,8 +339,8 @@ static int handle_dom0_cmd_unmapdommem(u
    1.13    if (copy_from_user(&argbuf, (void *)data, sizeof(argbuf)))
    1.14      return -EFAULT;
    1.15  
    1.16 -  return direct_disc_unmap(argbuf.vaddr, argbuf.start_pfn,
    1.17 -			   argbuf.tot_pages);
    1.18 +  return direct_unmap(current->mm, argbuf.vaddr,
    1.19 +		      argbuf.tot_pages << PAGE_SIZE);
    1.20  }
    1.21  
    1.22  static int dom0_cmd_ioctl(struct inode *inode, struct file *file,
     2.1 --- a/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_memory.c	Tue Jul 08 14:47:05 2003 +0000
     2.2 +++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_memory.c	Tue Jul 08 15:06:41 2003 +0000
     2.3 @@ -85,7 +85,7 @@ static inline int direct_remappmd_range(
     2.4  }
     2.5  
     2.6  /*  Note: this is only safe if the mm semaphore is held when called. */
     2.7 -int direct_remap_page_range(unsigned long from, unsigned long phys_addr, unsigned long size, pgprot_t prot)
     2.8 +static int direct_remap_page_range(unsigned long from, unsigned long phys_addr, unsigned long size, pgprot_t prot)
     2.9  {
    2.10      int error = 0;
    2.11      pgd_t * dir;
    2.12 @@ -120,8 +120,8 @@ int direct_remap_page_range(unsigned lon
    2.13   * used for remapping discontiguous bits of domain's memory, pages to map are
    2.14   * found from frame table beginning at the given first_pg index
    2.15   */ 
    2.16 -int direct_remap_disc_page_range(unsigned long from, 
    2.17 -                                 unsigned long first_pg, int tot_pages, pgprot_t prot)
    2.18 +static int direct_remap_disc_page_range(unsigned long from, 
    2.19 +					unsigned long first_pg, int tot_pages, pgprot_t prot)
    2.20  {
    2.21      dom0_op_t dom0_op;
    2.22      unsigned long *pfns = (unsigned long *)get_free_page(GFP_KERNEL);
    2.23 @@ -265,7 +265,7 @@ static inline int direct_zap_pmd_range(m
    2.24  /*
    2.25   * remove user pages in a given range.
    2.26   */
    2.27 -void direct_zap_page_range(struct mm_struct *mm, unsigned long address, unsigned long size)
    2.28 +static void direct_zap_page_range(struct mm_struct *mm, unsigned long address, unsigned long size)
    2.29  {
    2.30      mmu_gather_t *tlb;
    2.31      pgd_t * dir;