[PATCH] PCI: make drivers use the pci shutdown callback instead of the driver core...

[linux-2.6] / mm / page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 5c1b8982a6da582897e74dfa3f69fb3102032f5b..7ee675ad101eb579375050fb8ff503f6fbc4cfd1 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1650,12 +1650,14 @@ void __init memmap_init_zone(unsigned long size, int nid, unsigned long zone,
                unsigned long start_pfn)
 {
        struct page *page;
-       int end_pfn = start_pfn + size;
-       int pfn;
+       unsigned long end_pfn = start_pfn + size;
+       unsigned long pfn;
 
        for (pfn = start_pfn; pfn < end_pfn; pfn++, page++) {
                if (!early_pfn_valid(pfn))
                        continue;
+               if (!early_pfn_in_nid(pfn, nid))
+                       continue;
                page = pfn_to_page(pfn);
                set_page_links(page, zone, nid, pfn);
                set_page_count(page, 0);