Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[linux-2.6-block.git] / mm / page_ext.c

diff --git a/mm/page_ext.c b/mm/page_ext.c
index 2d864e64f7fe3d4128e4cf043a3d0b93374bcfea..44a4c029c8e79edef27405b44dbc2d6fcfa71112 100644 (file)
--- a/mm/page_ext.c
+++ b/mm/page_ext.c
@@ -390,8 +390,10 @@ void __init page_ext_init(void)
                         * We know some arch can have a nodes layout such as
                         * -------------pfn-------------->
                         * N0 | N1 | N2 | N0 | N1 | N2|....
+                        *
+                        * Take into account DEFERRED_STRUCT_PAGE_INIT.
                         */
-                       if (pfn_to_nid(pfn) != nid)
+                       if (early_pfn_to_nid(pfn) != nid)
                                continue;
                        if (init_section_page_ext(pfn, nid))
                                goto oom;