direct-io.hg

changeset 2517:bb7dd5c657d5

bitkeeper revision 1.1159.79.16 (4151ba487Aeg8o7xfxj8fOWjfxontw)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
author iap10@labyrinth.cl.cam.ac.uk
date Wed Sep 22 17:45:44 2004 +0000 (2004-09-22)
parents b3eb75cf942b 4b472ab99c9b
children b1a31ec18454
files linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/entry.S linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/ioremap.c
line diff
     1.1 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/entry.S	Wed Sep 22 16:00:42 2004 +0000
     1.2 +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/entry.S	Wed Sep 22 17:45:44 2004 +0000
     1.3 @@ -854,7 +854,7 @@ ENTRY(sys_call_table)
     1.4  	.long sys_iopl		/* 110 */
     1.5  	.long sys_vhangup
     1.6  	.long sys_ni_syscall	/* old "idle" system call */
     1.7 -	.long sys_vm86old
     1.8 +	.long sys_ni_syscall	/* disable sys_vm86old */
     1.9  	.long sys_wait4
    1.10  	.long sys_swapoff	/* 115 */
    1.11  	.long sys_sysinfo
     2.1 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/ioremap.c	Wed Sep 22 16:00:42 2004 +0000
     2.2 +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/mm/ioremap.c	Wed Sep 22 17:45:44 2004 +0000
     2.3 @@ -381,11 +381,11 @@ static inline int direct_remap_area_pmd(
     2.4      if (address >= end)
     2.5          BUG();
     2.6      do {
     2.7 -        pte_t *pte = pte_alloc_kernel(mm, pmd, address);
     2.8 +        pte_t *pte = pte_alloc_map(mm, pmd, address);
     2.9          if (!pte)
    2.10              return -ENOMEM;
    2.11          direct_remap_area_pte(pte, address, end - address, v);
    2.12 -
    2.13 +	pte_unmap(pte);
    2.14          address = (address + PMD_SIZE) & PMD_MASK;
    2.15          pmd++;
    2.16      } while (address && (address < end));