summaryrefslogtreecommitdiffstats
path: root/include/linux/mmzone.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-23 00:40:54 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-23 00:40:54 +0000
commit529c593ece216e4aaffd36bd940cb94f1fa63129 (patch)
tree78f1c0b805f5656aa7b0417a043c5346f700a2cf /include/linux/mmzone.h
parent0bd079751d25808d1972baee5c4eaa1db2227257 (diff)
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'include/linux/mmzone.h')
-rw-r--r--include/linux/mmzone.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index e3d688acf..d2b1d5a6a 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -29,7 +29,7 @@ typedef struct zone_struct {
unsigned long offset;
unsigned long free_pages;
int low_on_memory;
- unsigned long pages_low, pages_high;
+ unsigned long pages_min, pages_low, pages_high;
struct pglist_data *zone_pgdat;
/*