The patch titled
reduce MAX_NR_ZONES: make ZONE_DMA32 optional
has been added to the -mm tree. Its filename is
reduce-max_nr_zones-make-zone_dma32-optional.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: reduce MAX_NR_ZONES: make ZONE_DMA32 optional
From: Christoph Lameter <clameter@xxxxxxx>
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@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/ia64/Kconfig | 9 ---------
arch/x86_64/Kconfig | 4 ++++
include/linux/gfp.h | 2 +-
include/linux/mmzone.h | 16 +++++++++++++---
include/linux/vmstat.h | 4 +---
mm/page_alloc.c | 6 ++++++
6 files changed, 25 insertions(+), 16 deletions(-)
diff -puN arch/ia64/Kconfig~reduce-max_nr_zones-make-zone_dma32-optional arch/ia64/Kconfig
--- a/arch/ia64/Kconfig~reduce-max_nr_zones-make-zone_dma32-optional
+++ a/arch/ia64/Kconfig
@@ -66,15 +66,6 @@ config IA64_UNCACHED_ALLOCATOR
bool
select GENERIC_ALLOCATOR
-config DMA_IS_DMA32
- bool
- default y
-
-config DMA_IS_NORMAL
- bool
- depends on IA64_SGI_SN2
- default y
-
choice
prompt "System type"
default IA64_GENERIC
diff -puN arch/x86_64/Kconfig~reduce-max_nr_zones-make-zone_dma32-optional arch/x86_64/Kconfig
--- a/arch/x86_64/Kconfig~reduce-max_nr_zones-make-zone_dma32-optional
+++ a/arch/x86_64/Kconfig
@@ -24,6 +24,10 @@ config X86
bool
default y
+config ZONE_DMA32
+ bool
+ default y
+
config LOCKDEP_SUPPORT
bool
default y
diff -puN include/linux/gfp.h~reduce-max_nr_zones-make-zone_dma32-optional include/linux/gfp.h
--- a/include/linux/gfp.h~reduce-max_nr_zones-make-zone_dma32-optional
+++ a/include/linux/gfp.h
@@ -13,7 +13,7 @@ struct vm_area_struct;
/* Zone modifiers in GFP_ZONEMASK (see linux/mmzone.h - low three bits) */
#define __GFP_DMA ((__force gfp_t)0x01u)
#define __GFP_HIGHMEM ((__force gfp_t)0x02u)
-#ifdef CONFIG_DMA_IS_DMA32
+#ifndef CONFIG_ZONE_DMA32
#define __GFP_DMA32 ((__force gfp_t)0x01) /* ZONE_DMA is ZONE_DMA32 */
#elif BITS_PER_LONG < 64
#define __GFP_DMA32 ((__force gfp_t)0x00) /* ZONE_NORMAL is ZONE_DMA32 */
diff -puN include/linux/mmzone.h~reduce-max_nr_zones-make-zone_dma32-optional include/linux/mmzone.h
--- a/include/linux/mmzone.h~reduce-max_nr_zones-make-zone_dma32-optional
+++ a/include/linux/mmzone.h
@@ -108,12 +108,14 @@ typedef enum {
* <16M.
*/
ZONE_DMA,
+#ifdef CONFIG_ZONE_DMA32
/*
* x86_64 needs two ZONE_DMAs because it supports devices that are
* only able to do DMA to the lower 16M but also 32 bit devices that
* can only do DMA areas below 4G.
*/
ZONE_DMA32,
+#endif
/*
* Normal addressable memory is in ZONE_NORMAL. DMA operations can be
* performed on pages in ZONE_NORMAL if the DMA devices support
@@ -160,9 +162,13 @@ typedef enum {
*
* NOTE! Make sure this matches the zones in <linux/gfp.h>
*/
-#define GFP_ZONEMASK 0x07
-/* #define GFP_ZONETYPES (GFP_ZONEMASK + 1) */ /* Non-loner */
-#define GFP_ZONETYPES ((GFP_ZONEMASK + 1) / 2 + 1) /* Loner */
+#define GFP_ZONETYPES ((GFP_ZONEMASK + 1) / 2 + 1) /* Loner */
+
+#ifdef CONFIG_ZONE_DMA32
+#define GFP_ZONEMASK 0x07
+#else
+#define GFP_ZONEMASK 0x03
+#endif
struct zone {
/* Fields commonly accessed by the page allocator */
@@ -428,7 +434,11 @@ static inline int is_normal(struct zone
static inline int is_dma32(struct zone *zone)
{
+#ifdef CONFIG_ZONE_DMA32
return zone == zone->zone_pgdat->node_zones + ZONE_DMA32;
+#else
+ return 0;
+#endif
}
static inline int is_dma(struct zone *zone)
diff -puN include/linux/vmstat.h~reduce-max_nr_zones-make-zone_dma32-optional include/linux/vmstat.h
--- a/include/linux/vmstat.h~reduce-max_nr_zones-make-zone_dma32-optional
+++ a/include/linux/vmstat.h
@@ -124,12 +124,10 @@ static inline unsigned long node_page_st
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
diff -puN mm/page_alloc.c~reduce-max_nr_zones-make-zone_dma32-optional mm/page_alloc.c
--- a/mm/page_alloc.c~reduce-max_nr_zones-make-zone_dma32-optional
+++ a/mm/page_alloc.c
@@ -70,7 +70,9 @@ static void __free_pages_ok(struct page
*/
int sysctl_lowmem_reserve_ratio[MAX_NR_ZONES-1] = {
256,
+#ifdef CONFIG_ZONE_DMA32
256,
+#endif
32
};
@@ -85,7 +87,9 @@ EXPORT_SYMBOL(zone_table);
static char *zone_names[MAX_NR_ZONES] = {
"DMA",
+#ifdef CONFIG_ZONE_DMA32
"DMA32",
+#endif
"Normal",
"HighMem"
};
@@ -1381,8 +1385,10 @@ static inline int highest_zone(int zone_
int res = ZONE_NORMAL;
if (zone_bits & (__force int)__GFP_HIGHMEM)
res = ZONE_HIGHMEM;
+#ifdef CONFIG_ZONE_DMA32
if (zone_bits & (__force int)__GFP_DMA32)
res = ZONE_DMA32;
+#endif
if (zone_bits & (__force int)__GFP_DMA)
res = ZONE_DMA;
return res;
_
Patches currently in -mm which might be from clameter@xxxxxxx are
zvc-add-__inc_zone_state-for-smp-configuration.patch
reduce-max_nr_zones-remove-two-strange-uses-of-max_nr_zones.patch
reduce-max_nr_zones-fix-max_nr_zones-array-initializations.patch
reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem.patch
reduce-max_nr_zones-move-highmem-counters-into-highmemc-h.patch
reduce-max_nr_zones-page-allocator-zone_highmem-cleanup.patch
reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment.patch
reduce-max_nr_zones-make-zone_dma32-optional.patch
reduce-max_nr_zones-make-zone_highmem-optional.patch
reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones.patch
reduce-max_nr_zones-fix-i386-srat-check-for-max_nr_zones.patch
reduce-max_nr_zones-swap_prefetch-remove-incorrect-use-of-zone_highmem.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
