This is for calculation of the watermark zone->pages_min/low/high.
There is no change at take 4.
Signed-off-by: Yasunori Goto <[email protected]>
Index: zone_reclaim/include/linux/mmzone.h
===================================================================
--- zone_reclaim.orig/include/linux/mmzone.h 2005-12-19 20:24:04.000000000 +0900
+++ zone_reclaim/include/linux/mmzone.h 2005-12-19 20:24:07.000000000 +0900
@@ -394,6 +394,11 @@ static inline int populated_zone(struct
return (!!zone->present_pages);
}
+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);
@@ -410,11 +415,21 @@ 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;
}
+static inline int is_higher_zone(struct zone *zone)
+{
+ return (is_highmem(zone) || is_easy_reclaim(zone));
+}
+
static inline int is_normal(struct zone *zone)
{
return zone == zone->zone_pgdat->node_zones + ZONE_NORMAL;
Index: zone_reclaim/mm/page_alloc.c
===================================================================
--- zone_reclaim.orig/mm/page_alloc.c 2005-12-19 20:24:04.000000000 +0900
+++ zone_reclaim/mm/page_alloc.c 2005-12-19 20:24:07.000000000 +0900
@@ -2592,7 +2592,7 @@ void setup_per_zone_pages_min(void)
/* Calculate total number of !ZONE_HIGHMEM pages */
for_each_zone(zone) {
- if (!is_highmem(zone))
+ if (!is_higher_zone(zone))
lowmem_pages += zone->present_pages;
}
@@ -2600,7 +2600,7 @@ void setup_per_zone_pages_min(void)
unsigned long tmp;
spin_lock_irqsave(&zone->lru_lock, flags);
tmp = (pages_min * zone->present_pages) / lowmem_pages;
- if (is_highmem(zone)) {
+ if (is_higher_zone(zone)) {
/*
* __GFP_HIGH and PF_MEMALLOC allocations usually don't
* need highmem pages, so cap pages_min to a small
--
Yasunori Goto
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]