[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 fb84647dbf3dedd132e4e0082a232ab95e9da0e4..f75a686ba6443d7ed3853c9afcdbbc6eeaaa83a8 100644 (file)
--- 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 069ee3ccd84968784755cdcb7c2f95c3b41380f8..0f44a6a6675fa4d93a2cf9790f1f7dbf203c4953 100644 (file)
--- 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 09d434f41e4b37059cf7e6fa1d724f1695e25469..b1a1ee0cc6bd6b514e5d05b2b4d00d8e2de55e8b 100644 (file)
--- 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,