]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
xen: handle highmem pages correctly when shrinking a domain
authorIan Campbell <ian.campbell@citrix.com>
Fri, 23 Jan 2009 16:26:21 +0000 (16:26 +0000)
committerIngo Molnar <mingo@elte.hu>
Fri, 23 Jan 2009 17:55:28 +0000 (18:55 +0100)
Commit 1058a75f07b9bb8323fb5197be5526220f8b75cf ("xen: actually release
memory when shrinking domain") causes a crash if the page being released
is a highmem page.

If a page is highmem then there is no need to unmap it.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
drivers/xen/balloon.c

index 8069d520c46048fee02441793d5b91977ae680df..2ba8f95516a0b023c8afce948b757e2884b3cb21 100644 (file)
@@ -299,10 +299,13 @@ static int decrease_reservation(unsigned long nr_pages)
 
                scrub_page(page);
 
-               ret = HYPERVISOR_update_va_mapping(
-                       (unsigned long)__va(pfn << PAGE_SHIFT),
-                       __pte_ma(0), 0);
-               BUG_ON(ret);
+               if (!PageHighMem(page)) {
+                       ret = HYPERVISOR_update_va_mapping(
+                               (unsigned long)__va(pfn << PAGE_SHIFT),
+                               __pte_ma(0), 0);
+                       BUG_ON(ret);
+                }
+
        }
 
        /* Ensure that ballooned highmem pages don't have kmaps. */