[PATCH] optional ZONE_DMA: remove ZONE_DMA remains from sh/sh64

sh / sh64: Remove ZONE_DMA remains.

Both arches do not need ZONE_DMA

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 2 insertions, 23 deletions

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 29bd37b1488e..bf0c263cb6fd 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -158,7 +158,6 @@ void __init paging_init(void)
          * Setup some defaults for the zone sizes.. these should be safe
          * regardless of distcontiguous memory or MMU settings.
          */
-        zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT;
         zones_size[ZONE_NORMAL] = __MEMORY_SIZE >> PAGE_SHIFT;
 #ifdef CONFIG_HIGHMEM
         zones_size[ZONE_HIGHMEM] = 0 >> PAGE_SHIFT;
@@ -170,8 +169,6 @@ void __init paging_init(void)
          * the zone sizes accordingly, in addition to turning it on.
          */
         {
-                unsigned long max_dma, low, start_pfn;
-
                 /* We don't need to map the kernel through the TLB, as
                  * it is permanatly mapped using P1. So clear the
                  * entire pgd. */
@@ -179,19 +176,7 @@ void __init paging_init(void)
 
                 /* Turn on the MMU */
                 enable_mmu();
-
-                /* Fixup the zone sizes */
-                start_pfn = START_PFN;
-                max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
-                low = MAX_LOW_PFN;
-
-                if (low < max_dma) {
-                        zones_size[ZONE_DMA] = low - start_pfn;
-                        zones_size[ZONE_NORMAL] = 0;
-                } else {
-                        zones_size[ZONE_DMA] = max_dma - start_pfn;
-                        zones_size[ZONE_NORMAL] = low - max_dma;
-                }
+                zones_size[ZONE_NORMAL] = MAX_LOW_PFN - START_PFN;
         }
 
         /* Set an initial value for the MMU.TTB so we don't have to
diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
index 7bc0744b7ab6..e14b533558c8 100644
--- a/arch/sh64/Kconfig
+++ b/arch/sh64/Kconfig
@@ -36,9 +36,6 @@ config GENERIC_CALIBRATE_DELAY
 config RWSEM_XCHGADD_ALGORITHM
         bool
 
-config GENERIC_ISA_DMA
-        bool
-
 config ARCH_HAS_ILOG2_U32
         bool
         default n
diff --git a/arch/sh64/mm/init.c b/arch/sh64/mm/init.c
index 83295bd21aa7..5dc08787259c 100644
--- a/arch/sh64/mm/init.c
+++ b/arch/sh64/mm/init.c
@@ -118,10 +118,7 @@ void __init paging_init(void)
 
         mmu_context_cache = MMU_CONTEXT_FIRST_VERSION;
 
-        /*
-         * All memory is good as ZONE_NORMAL (fall-through) and ZONE_DMA.
-         */
-        zones_size[ZONE_DMA] = MAX_LOW_PFN - START_PFN;
+        zones_size[ZONE_NORMAL] = MAX_LOW_PFN - START_PFN;
         NODE_DATA(0)->node_mem_map = NULL;
         free_area_init_node(0, NODE_DATA(0), zones_size, __MEMORY_START >> PAGE_SHIFT, 0);
 }