bitkeeper revision 1.1159.258.45 (4230e6ab4xRdK4pchNbpgZE-preulA)

Fix one more pud merge incident.
Signed-off-by: Christian Limpach <chris@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c
index e8d48949d3a69a1a063359447ae801115e760168..8a0df417edf2bd30ea59d962d067238d1bef62cc 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/ioremap.c
@@ -369,7 +369,7 @@ int __direct_remap_area_pages(struct mm_struct *mm,
                pud = pud_alloc(mm, dir, address);
                if (!pud)
                        break;
-               pmd = pmd_alloc(mm, dir, address);
+               pmd = pmd_alloc(mm, pud, address);
                if (!pmd)
                        break;
                error = 0;