Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00592837 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[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: default avatarChristoph 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 09ae1f58

arch/parisc/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ config TIME_LOW_RES 
	depends on SMP

	default y



config GENERIC_ISA_DMA

	bool



config GENERIC_HARDIRQS

	def_bool y

arch/parisc/mm/init.c

+1 −3
Original line number Diff line number Diff line
@@ -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