From 432f20262e394158b7a9ff8197d0184d6f836a79 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Wed, 11 Jul 2012 14:02:51 -0700 Subject: [PATCH] --- yaml --- r: 311841 b: refs/heads/master c: 07b4e2bc9c35ea88cbd36d806fcd5e3bcbf022be h: refs/heads/master i: 311839: 83b478537cad0ff689a7d5056e17ce65e87a45ff v: v3 --- [refs] | 2 +- trunk/mm/sparse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8c7fdeb369bc..0c217310d2aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 688bb4158f64f3af0fe1d13e7642f8c4c402453e +refs/heads/master: 07b4e2bc9c35ea88cbd36d806fcd5e3bcbf022be diff --git a/trunk/mm/sparse.c b/trunk/mm/sparse.c index 6a4bf9160e85..e861397016a9 100644 --- a/trunk/mm/sparse.c +++ b/trunk/mm/sparse.c @@ -287,7 +287,7 @@ sparse_early_usemaps_alloc_pgdat_section(struct pglist_data *pgdat, * from the same section as the pgdat where possible to avoid * this problem. */ - goal = __pa(pgdat) & PAGE_SECTION_MASK; + goal = __pa(pgdat) & (PAGE_SECTION_MASK << PAGE_SHIFT); host_pgdat = NODE_DATA(early_pfn_to_nid(goal >> PAGE_SHIFT)); return __alloc_bootmem_node_nopanic(host_pgdat, size, SMP_CACHE_BYTES, goal);