diff options
| author | Christoph Lameter <clameter@sgi.com> | 2006-09-25 23:31:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 08:48:46 -0700 |
| commit | fb0e7942bdcbbd2f90e61cb4cfa4fa892a873f8a (patch) | |
| tree | 71344e9afafbd631f4ac010bc8c48e0b16737299 /include/linux/vmstat.h | |
| parent | 2f1b6248682f8b39ca3c7e549dfc216d26c4109b (diff) | |
| download | linux-3.10-fb0e7942bdcbbd2f90e61cb4cfa4fa892a873f8a.tar.gz linux-3.10-fb0e7942bdcbbd2f90e61cb4cfa4fa892a873f8a.tar.bz2 linux-3.10-fb0e7942bdcbbd2f90e61cb4cfa4fa892a873f8a.zip | |
[PATCH] reduce MAX_NR_ZONES: make ZONE_DMA32 optional
Make ZONE_DMA32 optional
- Add #ifdefs around ZONE_DMA32 specific code and definitions.
- Add CONFIG_ZONE_DMA32 config option and use that for x86_64
that alone needs this zone.
- Remove the use of CONFIG_DMA_IS_DMA32 and CONFIG_DMA_IS_NORMAL
for ia64 and fix up the way per node ZVCs are calculated.
- Fall back to prior GFP_ZONEMASK of 0x03 if there is no
DMA32 zone.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/vmstat.h')
| -rw-r--r-- | include/linux/vmstat.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index 2d9b1b60798..9c6e62c56ec 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -124,12 +124,10 @@ static inline unsigned long node_page_state(int node, struct zone *zones = NODE_DATA(node)->node_zones; return -#ifndef CONFIG_DMA_IS_NORMAL -#if !defined(CONFIG_DMA_IS_DMA32) && BITS_PER_LONG >= 64 +#ifdef CONFIG_ZONE_DMA32 zone_page_state(&zones[ZONE_DMA32], item) + #endif zone_page_state(&zones[ZONE_NORMAL], item) + -#endif #ifdef CONFIG_HIGHMEM zone_page_state(&zones[ZONE_HIGHMEM], item) + #endif |