Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit f7232154198f928fc25f420d6190468212a7632a

Authored by Johannes Weiner
Committed by Linus Torvalds
1 parent f899b0adc6
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

mm: don't drop a partial page in a zone's memory map size 

In a zone's present pages number, account for all pages occupied by the
memory map, including a partial.

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

... ... @@ -3378,7 +3378,8 @@
3378 3378 * is used by this zone for memmap. This affects the watermark
3379 3379 * and per-cpu initialisations
3380 3380 */
3381   - memmap_pages = (size * sizeof(struct page)) >> PAGE_SHIFT;
  3381 + memmap_pages =
  3382 + PAGE_ALIGN(size * sizeof(struct page)) >> PAGE_SHIFT;
3382 3383 if (realsize >= memmap_pages) {
3383 3384 realsize -= memmap_pages;
3384 3385 printk(KERN_DEBUG