Pull mca-check-psp into release branch

[linux-2.6-omap-h63xx.git] / arch / ia64 / kernel / mca_drv.c

diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c
index eb860e29341533a6b2d44e90a30f4fa4e6e8c18b..3492e3211a4416ce615a1d0f14810be94aa6178d 100644 (file)
--- a/arch/ia64/kernel/mca_drv.c
+++ b/arch/ia64/kernel/mca_drv.c
@@ -88,7 +88,7 @@ mca_page_isolate(unsigned long paddr)
        if (!ia64_phys_addr_valid(paddr))
                return ISOLATE_NONE;
 
-       if (!pfn_valid(paddr))
+       if (!pfn_valid(paddr >> PAGE_SHIFT))
                return ISOLATE_NONE;
 
        /* convert physical address to physical page number */
@@ -108,6 +108,7 @@ mca_page_isolate(unsigned long paddr)
                return ISOLATE_NG;
 
        /* add attribute 'Reserved' and register the page */
+       get_page(p);
        SetPageReserved(p);
        page_isolate[num_page_isolate++] = p;