summaryrefslogtreecommitdiffstats
path: root/include/linux/mmzone.h
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2006-09-25 23:31:14 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-26 08:48:46 -0700
commite53ef38d05dd59ed281a35590e4a5b64d8ff4c52 (patch)
tree42e525df84454e89abd6cab8d7983a6a0188b6bb /include/linux/mmzone.h
parentfb0e7942bdcbbd2f90e61cb4cfa4fa892a873f8a (diff)
downloadop-kernel-dev-e53ef38d05dd59ed281a35590e4a5b64d8ff4c52.zip
op-kernel-dev-e53ef38d05dd59ed281a35590e4a5b64d8ff4c52.tar.gz
[PATCH] reduce MAX_NR_ZONES: make ZONE_HIGHMEM optional
Make ZONE_HIGHMEM optional - ifdef out code and definitions related to CONFIG_HIGHMEM - __GFP_HIGHMEM falls back to normal allocations if there is no ZONE_HIGHMEM - GFP_ZONEMASK becomes 0x01 if there is no DMA32 and no HIGHMEM zone. [jdike@addtoit.com: build fix] Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Christoph Lameter <clameter@engr.sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/mmzone.h')
-rw-r--r--include/linux/mmzone.h36
1 files changed, 33 insertions, 3 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index adae3c9..76d33e6 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -123,6 +123,7 @@ enum zone_type {
* transfers to all addressable memory.
*/
ZONE_NORMAL,
+#ifdef CONFIG_HIGHMEM
/*
* A memory area that is only addressable by the kernel through
* mapping portions into its own address space. This is for example
@@ -132,11 +133,10 @@ enum zone_type {
* access.
*/
ZONE_HIGHMEM,
-
+#endif
MAX_NR_ZONES
};
-#define ZONES_SHIFT 2 /* ceil(log2(MAX_NR_ZONES)) */
/*
* When a memory allocation must conform to specific limitations (such
@@ -163,12 +163,34 @@ enum zone_type {
*
* NOTE! Make sure this matches the zones in <linux/gfp.h>
*/
-#define GFP_ZONETYPES ((GFP_ZONEMASK + 1) / 2 + 1) /* Loner */
#ifdef CONFIG_ZONE_DMA32
+
+#ifdef CONFIG_HIGHMEM
+#define GFP_ZONETYPES ((GFP_ZONEMASK + 1) / 2 + 1) /* Loner */
#define GFP_ZONEMASK 0x07
+#define ZONES_SHIFT 2 /* ceil(log2(MAX_NR_ZONES)) */
#else
+#define GFP_ZONETYPES ((0x07 + 1) / 2 + 1) /* Loner */
+/* Mask __GFP_HIGHMEM */
+#define GFP_ZONEMASK 0x05
+#define ZONES_SHIFT 2
+#endif
+
+#else
+#ifdef CONFIG_HIGHMEM
+
#define GFP_ZONEMASK 0x03
+#define ZONES_SHIFT 2
+#define GFP_ZONETYPES 3
+
+#else
+
+#define GFP_ZONEMASK 0x01
+#define ZONES_SHIFT 1
+#define GFP_ZONETYPES 2
+
+#endif
#endif
struct zone {
@@ -409,7 +431,11 @@ static inline int populated_zone(struct zone *zone)
static inline int is_highmem_idx(enum zone_type idx)
{
+#ifdef CONFIG_HIGHMEM
return (idx == ZONE_HIGHMEM);
+#else
+ return 0;
+#endif
}
static inline int is_normal_idx(enum zone_type idx)
@@ -425,7 +451,11 @@ static inline int is_normal_idx(enum zone_type idx)
*/
static inline int is_highmem(struct zone *zone)
{
+#ifdef CONFIG_HIGHMEM
return zone == zone->zone_pgdat->node_zones + ZONE_HIGHMEM;
+#else
+ return 0;
+#endif
}
static inline int is_normal(struct zone *zone)
OpenPOWER on IntegriCloud