diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2013-01-23 19:14:03 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-01-23 19:14:03 -0500 |
| commit | 8e306f694496f6191ca3a2cde469d20333865fc8 (patch) | |
| tree | 1a25e7cdda38fa31a3fddedd6b315b0323634e37 /mm/page_alloc.c | |
| parent | 13fa57aab5fd50aa084671be2874a3ce49a6a9a7 (diff) | |
| parent | 0829a6cc39cfcd76caaf562b4254c95392463b62 (diff) | |
Merge tag 'v3.0.59' into v3.0-rt
This is the 3.0.59 stable release
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index c645e07cbfee..9534b6ccc0fc 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5554,7 +5554,7 @@ static inline int pfn_to_bitidx(struct zone *zone, unsigned long pfn) pfn &= (PAGES_PER_SECTION-1); return (pfn >> pageblock_order) * NR_PAGEBLOCK_BITS; #else - pfn = pfn - zone->zone_start_pfn; + pfn = pfn - round_down(zone->zone_start_pfn, pageblock_nr_pages); return (pfn >> pageblock_order) * NR_PAGEBLOCK_BITS; #endif /* CONFIG_SPARSEMEM */ } |