ia64/xen-unstable

changeset 4091:0b05ec3c5331

bitkeeper revision 1.1159.258.45 (4230e6ab4xRdK4pchNbpgZE-preulA)

Fix one more pud merge incident.
Signed-off-by: Christian Limpach <chris@xensource.com>
author cl349@firebug.cl.cam.ac.uk
date Fri Mar 11 00:30:35 2005 +0000 (2005-03-11)
parents 4d3267854182
children 60bb8d7ebc64
files linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c	Fri Mar 11 00:28:36 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c	Fri Mar 11 00:30:35 2005 +0000
     1.3 @@ -369,7 +369,7 @@ int __direct_remap_area_pages(struct mm_
     1.4  		pud = pud_alloc(mm, dir, address);
     1.5  		if (!pud)
     1.6  			break;
     1.7 -		pmd = pmd_alloc(mm, dir, address);
     1.8 +		pmd = pmd_alloc(mm, pud, address);
     1.9  		if (!pmd)
    1.10  			break;
    1.11  		error = 0;