From e885adb83d70a4d33e600c977e736d0d406ca499 Mon Sep 17 00:00:00 2001 From: Jiang Liu Date: Wed, 19 Jun 2013 10:06:20 +1000 Subject: [PATCH] mm-correctly-update-zone-managed_pages-fix-fix When CONFIG_HIGHMEM is undefined, totalhigh_pages is defined as: #define totalhigh_pages 0UL Thus statement "totalhigh_pages += count" will cause build failure as: CC mm/page_alloc.o mm/page_alloc.c: In function `adjust_managed_page_count': mm/page_alloc.c:5262:19: error: lvalue required as left operand of assignment make[1]: *** [mm/page_alloc.o] Error 1 make: *** [mm/page_alloc.o] Error 2 So we still need to use CONFIG_HIGHMEM to guard the statement. Cc: Michal Hocko Signed-off-by: Andrew Morton --- mm/page_alloc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 12722217efbf..8bbd39367e7a 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5203,8 +5203,10 @@ void adjust_managed_page_count(struct page *page, long count) spin_lock(&managed_page_count_lock); page_zone(page)->managed_pages += count; totalram_pages += count; +#ifdef CONFIG_HIGHMEM if (PageHighMem(page)) totalhigh_pages += count; +#endif spin_unlock(&managed_page_count_lock); } -- 2.39.5