ia64/xen-unstable

changeset 568:7a7e8d7da0dc

bitkeeper revision 1.312 (3f0bf67eeh-Rhf-ZdegJfQJlyU4ZiQ)

I'm an idiot. Shoot me now.
author sos22@labyrinth.cl.cam.ac.uk
date Wed Jul 09 11:03:26 2003 +0000 (2003-07-09)
parents f11254826a31
children a4f6a72f64e0
files 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_memory.c	Wed Jul 09 10:58:38 2003 +0000
     1.2 +++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/dom0_memory.c	Wed Jul 09 11:03:26 2003 +0000
     1.3 @@ -50,7 +50,7 @@ static int direct_remap_page(unsigned lo
     1.4      pmd = pmd_alloc(mm, dir, from);
     1.5      if (!pmd)
     1.6  	return -ENOMEM;
     1.7 -    pte = pte_alloc(mm, pmd, address);
     1.8 +    pte = pte_alloc(mm, pmd, from);
     1.9      if (!pte) {
    1.10  	/* XXX free pmd? */
    1.11  	return -ENOMEM;
    1.12 @@ -148,11 +148,11 @@ unsigned long direct_mmap(unsigned long 
    1.13  	list_add_tail(&dmmap->list, &current->mm->context.direct_list);
    1.14      }
    1.15  
    1.16 -    /* Acquire mm sem? */
    1.17 +    /* Acquire mm sem? XXX */
    1.18      /* and perform the mapping */
    1.19      ret = direct_remap_disc_page_range(addr, phys_addr >> PAGE_SHIFT, 
    1.20  				       tot_pages, prot);
    1.21 -    /* Drop mm sem? */
    1.22 +    /* Drop mm sem? XXX */
    1.23  
    1.24      if(ret == 0)
    1.25          return addr;