From 1d240b150f3d0910664f5a443af0e04fcd688b3f Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Sat, 10 Feb 2007 01:43:12 -0800 Subject: [PATCH] --- yaml --- r: 47412 b: refs/heads/master c: 005928374bf339e0b6783d78da8fd0701631e7ee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/parisc/Kconfig | 3 --- trunk/arch/parisc/mm/init.c | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 47b25888faad..8375bbe2019e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09ae1f585e9def652cdb1d0484611d4f4dc2d5fd +refs/heads/master: 005928374bf339e0b6783d78da8fd0701631e7ee diff --git a/trunk/arch/parisc/Kconfig b/trunk/arch/parisc/Kconfig index 0f9ff618c6d7..28da4e71c443 100644 --- a/trunk/arch/parisc/Kconfig +++ b/trunk/arch/parisc/Kconfig @@ -50,9 +50,6 @@ config TIME_LOW_RES depends on SMP default y -config GENERIC_ISA_DMA - bool - config GENERIC_HARDIRQS def_bool y diff --git a/trunk/arch/parisc/mm/init.c b/trunk/arch/parisc/mm/init.c index 0667f2b4f977..0c118e584e73 100644 --- a/trunk/arch/parisc/mm/init.c +++ b/trunk/arch/parisc/mm/init.c @@ -808,9 +808,7 @@ void __init paging_init(void) for (i = 0; i < npmem_ranges; i++) { unsigned long zones_size[MAX_NR_ZONES] = { 0, }; - /* We have an IOMMU, so all memory can go into a single - ZONE_DMA zone. */ - zones_size[ZONE_DMA] = pmem_ranges[i].pages; + zones_size[ZONE_NORMAL] = pmem_ranges[i].pages; #ifdef CONFIG_DISCONTIGMEM /* Need to initialize the pfnnid_map before we can initialize