From mboxrd@z Thu Jan  1 00:00:00 1970
From: Yasunori Goto <y-goto@jp.fujitsu.com>
Date: Mon, 28 Nov 2005 11:36:38 +0000
Subject: [Patch] New zone ZONE_EASY_RECLAIM take 2[4/5]
Message-Id: <20051128200435.5D80.Y-GOTO@jp.fujitsu.com>
List-Id: <linux-ia64.vger.kernel.org>
References: <20051128195854.5D78.Y-GOTO@jp.fujitsu.com>
In-Reply-To: <20051128195854.5D78.Y-GOTO@jp.fujitsu.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: linux-mm <linux-mm@kvack.org>, Linux Hotplug Memory Support <lhms-devel@lists.sourceforge.net>
Cc: Joel Schopp <jschopp@austin.ibm.com>, linux-ia64@vger.kernel.org


This is for calculation of the watermark zone->pages_min/low/high.

Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>

Index: new_zone_mm/include/linux/mmzone.h
=================================--- new_zone_mm.orig/include/linux/mmzone.h	2005-11-17 17:07:30.000000000 +0900
+++ new_zone_mm/include/linux/mmzone.h	2005-11-17 17:17:51.000000000 +0900
@@ -401,6 +401,11 @@ static inline struct zone *next_zone(str
 #define for_each_zone(zone) \
 	for (zone = pgdat_list->node_zones; zone; zone = next_zone(zone))
 
+static inline int is_easy_reclaim_idx(int idx)
+{
+	return (idx = ZONE_EASY_RECLAIM);
+}
+
 static inline int is_highmem_idx(int idx)
 {
 	return (idx = ZONE_HIGHMEM);
@@ -416,6 +421,11 @@ static inline int is_normal_idx(int idx)
  *              to ZONE_{DMA/NORMAL/HIGHMEM/etc} in general code to a minimum.
  * @zone - pointer to struct zone variable
  */
+static inline int is_easy_reclaim(struct zone *zone)
+{
+	return zone = zone->zone_pgdat->node_zones + ZONE_EASY_RECLAIM;
+}
+
 static inline int is_highmem(struct zone *zone)
 {
 	return zone = zone->zone_pgdat->node_zones + ZONE_HIGHMEM;
Index: new_zone_mm/mm/page_alloc.c
=================================--- new_zone_mm.orig/mm/page_alloc.c	2005-11-17 17:09:05.000000000 +0900
+++ new_zone_mm/mm/page_alloc.c	2005-11-17 17:17:51.000000000 +0900
@@ -2495,13 +2495,13 @@ void setup_per_zone_pages_min(void)
 
 	/* Calculate total number of !ZONE_HIGHMEM pages */
 	for_each_zone(zone) {
-		if (!is_highmem(zone))
+		if (!is_highmem(zone) && !is_easy_reclaim(zone))
 			lowmem_pages += zone->present_pages;
 	}
 
 	for_each_zone(zone) {
 		spin_lock_irqsave(&zone->lru_lock, flags);
-		if (is_highmem(zone)) {
+		if (is_highmem(zone) || is_easy_reclaim(zone)) {
 			/*
 			 * Often, highmem doesn't need to reserve any pages.
 			 * But the pages_min/low/high values are also used for

-- 
Yasunori Goto