mm/page_alloc.c: don't show protection in zone's ->lowmem_reserve[] for empty zone

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

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d932f406c0c1aa0a2bb19d0665a41409932ee66d..875cec8c77089ff1d0d47dc0628bd3b94efc696c 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -315,7 +315,7 @@ static inline bool deferred_pages_enabled(void)
 static bool __ref
 _deferred_grow_zone(struct zone *zone, unsigned int order)
 {
-       return deferred_grow_zone(zone, order);
+       return deferred_grow_zone(zone, order);
 }
 #else
 static inline bool deferred_pages_enabled(void)
@@ -5903,10 +5903,11 @@ static void setup_per_zone_lowmem_reserve(void)
 
                        for (j = i + 1; j < MAX_NR_ZONES; j++) {
                                struct zone *upper_zone = &pgdat->node_zones[j];
+                               bool empty = !zone_managed_pages(upper_zone);
 
                                managed_pages += zone_managed_pages(upper_zone);
 
-                               if (clear)
+                               if (clear || empty)
                                        zone->lowmem_reserve[j] = 0;
                                else
                                        zone->lowmem_reserve[j] = managed_pages / ratio;