summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2009-09-08 17:58:53 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2009-09-08 17:58:53 +0100
commit471ee426ccc66ab6c8208dd9dd4bc2a5a9ad8be2 (patch)
tree8af29ca9341be5028c1849542004bdb3e1e1fd4b /include
parentc5f2e348b844f3fb496f90b70c8b37365e999e6c (diff)
RealView: Re-implement the sparsemem support for PBX
The sparsemem support for the PBX board now uses 3 blocks and only the first one is used for DMA (no memory zones reordering needed). The commit also adds automatic meminfo setting so that no mem= option needs to be given on the kernel command line. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mmzone.h20
1 files changed, 0 insertions, 20 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 13ce4536c161..35a7b5e19465 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -212,34 +212,22 @@ enum zone_type {
* i386, x86_64 and multiple other arches
* <16M.
*/
-#ifdef CONFIG_ZONE_DMA_IDX
- ZONE_DMA = CONFIG_ZONE_DMA_IDX,
-#else
ZONE_DMA,
#endif
-#endif
#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.
*/
-#ifdef CONFIG_ZONE_DMA32_IDX
- ZONE_DMA32 = CONFIG_ZONE_DMA32_IDX,
-#else
ZONE_DMA32,
#endif
-#endif
/*
* Normal addressable memory is in ZONE_NORMAL. DMA operations can be
* performed on pages in ZONE_NORMAL if the DMA devices support
* transfers to all addressable memory.
*/
-#ifdef CONFIG_ZONE_NORMAL_IDX
- ZONE_NORMAL = CONFIG_ZONE_NORMAL_IDX,
-#else
ZONE_NORMAL,
-#endif
#ifdef CONFIG_HIGHMEM
/*
* A memory area that is only addressable by the kernel through
@@ -249,17 +237,9 @@ enum zone_type {
* table entries on i386) for each page that the kernel needs to
* access.
*/
-#ifdef CONFIG_ZONE_HIGHMEM_IDX
- ZONE_HIGHMEM = CONFIG_ZONE_HIGHMEM_IDX,
-#else
ZONE_HIGHMEM,
#endif
-#endif
-#ifdef CONFIG_ZONE_MOVABLE_IDX
- ZONE_MOVABLE = CONFIG_ZONE_MOVABLE_IDX,
-#else
ZONE_MOVABLE,
-#endif
__MAX_NR_ZONES
};