Merge to Fedora kernel-2.6.7-1.441

[linux-2.6.git] / arch / x86_64 / mm / ioremap.c

diff --git a/arch/x86_64/mm/ioremap.c b/arch/x86_64/mm/ioremap.c
index 8d1cb38..0cc4a61 100644 (file)
--- a/arch/x86_64/mm/ioremap.c
+++ b/arch/x86_64/mm/ioremap.c
@@ -158,6 +158,7 @@ void * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flag
        area = get_vm_area(size, VM_IOREMAP);
        if (!area)
                return NULL;
+       area->phys_addr = phys_addr;
        addr = area->addr;
        if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
                vunmap(addr);