From: David S. Miller <davem@sunset.davemloft.net>
Date: Mon, 12 Feb 2007 08:13:31 +0000 (-0800)
Subject: [SPARC64]: We do not need ZONE_DMA.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1b51d3a08b6c80a1e47d4c579c41abbe56cd3c44;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

[SPARC64]: We do not need ZONE_DMA.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index fb84647dbf3d..f75a686ba644 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -232,14 +232,6 @@ config LARGE_ALLOCS
 
 source "mm/Kconfig"
 
-config ZONE_DMA
-	bool
-	default y
-
-config GENERIC_ISA_DMA
-	bool
-	default y
-
 config ISA
 	bool
 	help
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 069ee3ccd849..0f44a6a6675f 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.20
-# Sat Feb 10 23:08:12 2007
+# Sun Feb 11 23:47:40 2007
 #
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
@@ -49,7 +49,6 @@ CONFIG_POSIX_MQUEUE=y
 # CONFIG_IKCONFIG is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
-CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
@@ -144,7 +143,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
-CONFIG_GENERIC_ISA_DMA=y
+CONFIG_ZONE_DMA_FLAG=0
 CONFIG_SBUS=y
 CONFIG_SBUSCHAR=y
 CONFIG_SUN_AUXIO=y
@@ -1259,6 +1258,10 @@ CONFIG_USB_HIDDEV=y
 # DMA Devices
 #
 
+#
+# Auxiliary Display support
+#
+
 #
 # Virtualization
 #
@@ -1450,7 +1453,6 @@ CONFIG_SCHEDSTATS=y
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
@@ -1533,4 +1535,5 @@ CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_PLIST=y
-CONFIG_IOMAP_COPY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 09d434f41e4b..b1a1ee0cc6bd 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -1467,8 +1467,8 @@ void __init paging_init(void)
 		for (znum = 0; znum < MAX_NR_ZONES; znum++)
 			zones_size[znum] = zholes_size[znum] = 0;
 
-		zones_size[ZONE_DMA] = end_pfn;
-		zholes_size[ZONE_DMA] = end_pfn - pages_avail;
+		zones_size[ZONE_NORMAL] = end_pfn;
+		zholes_size[ZONE_NORMAL] = end_pfn - pages_avail;
 
 		free_area_init_node(0, &contig_page_data, zones_size,
 				    __pa(PAGE_OFFSET) >> PAGE_SHIFT,