diff options
author | Christoph Lameter <clameter@sgi.com> | 2007-02-10 04:43:12 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 13:51:18 -0500 |
commit | 005928374bf339e0b6783d78da8fd0701631e7ee (patch) | |
tree | 99f476bb74aac5fa51890089d2707a615b156e87 | |
parent | 09ae1f585e9def652cdb1d0484611d4f4dc2d5fd (diff) |
[PATCH] optional ZONE_DMA: remove ZONE_DMA remains from parisc
Remove ZONE_DMA remains from parisc so that kernels are build without
ZONE_DMA.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Matthew Wilcox <willy@debian.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/parisc/Kconfig | 3 | ||||
-rw-r--r-- | arch/parisc/mm/init.c | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 0f9ff618c6d7..28da4e71c443 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
@@ -50,9 +50,6 @@ config TIME_LOW_RES | |||
50 | depends on SMP | 50 | depends on SMP |
51 | default y | 51 | default y |
52 | 52 | ||
53 | config GENERIC_ISA_DMA | ||
54 | bool | ||
55 | |||
56 | config GENERIC_HARDIRQS | 53 | config GENERIC_HARDIRQS |
57 | def_bool y | 54 | def_bool y |
58 | 55 | ||
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 0667f2b4f977..0c118e584e73 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c | |||
@@ -808,9 +808,7 @@ void __init paging_init(void) | |||
808 | for (i = 0; i < npmem_ranges; i++) { | 808 | for (i = 0; i < npmem_ranges; i++) { |
809 | unsigned long zones_size[MAX_NR_ZONES] = { 0, }; | 809 | unsigned long zones_size[MAX_NR_ZONES] = { 0, }; |
810 | 810 | ||
811 | /* We have an IOMMU, so all memory can go into a single | 811 | zones_size[ZONE_NORMAL] = pmem_ranges[i].pages; |
812 | ZONE_DMA zone. */ | ||
813 | zones_size[ZONE_DMA] = pmem_ranges[i].pages; | ||
814 | 812 | ||
815 | #ifdef CONFIG_DISCONTIGMEM | 813 | #ifdef CONFIG_DISCONTIGMEM |
816 | /* Need to initialize the pfnnid_map before we can initialize | 814 | /* Need to initialize the pfnnid_map before we can initialize |