Patched in Tegra support.

2 files changed, 8 insertions, 43 deletions

diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c
index 9cb85537bd2..f8435cd36c7 100644
--- a/arch/blackfin/mm/init.c
+++ b/arch/blackfin/mm/init.c
@@ -8,7 +8,6 @@
 #include <linux/swap.h>
 #include <linux/bootmem.h>
 #include <linux/uaccess.h>
-#include <linux/export.h>
 #include <asm/bfin-global.h>
 #include <asm/pda.h>
 #include <asm/cplbinit.h>
@@ -48,7 +47,7 @@ void __init paging_init(void)
 
         unsigned long zones_size[MAX_NR_ZONES] = {
                 [0] = 0,
-                [ZONE_DMA] = (end_mem - CONFIG_PHY_RAM_BASE_ADDRESS) >> PAGE_SHIFT,
+                [ZONE_DMA] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT,
                 [ZONE_NORMAL] = 0,
 #ifdef CONFIG_HIGHMEM
                 [ZONE_HIGHMEM] = 0,
@@ -60,8 +59,7 @@ void __init paging_init(void)
 
         pr_debug("free_area_init -> start_mem is %#lx virtual_end is %#lx\n",
                 PAGE_ALIGN(memory_start), end_mem);
-        free_area_init_node(0, zones_size,
-                CONFIG_PHY_RAM_BASE_ADDRESS >> PAGE_SHIFT, NULL);
+        free_area_init(zones_size);
 }
 
 asmlinkage void __init init_pda(void)
@@ -76,6 +74,9 @@ asmlinkage void __init init_pda(void)
            valid pointers to it. */
         memset(&cpu_pda[cpu], 0, sizeof(cpu_pda[cpu]));
 
+        cpu_pda[0].next = &cpu_pda[1];
+        cpu_pda[1].next = &cpu_pda[0];
+
 #ifdef CONFIG_EXCEPTION_L1_SCRATCH
         cpu_pda[cpu].ex_stack = (unsigned long *)(L1_SCRATCH_START + \
                                         L1_SCRATCH_LENGTH);
@@ -107,10 +108,10 @@ void __init mem_init(void)
         totalram_pages = free_all_bootmem();
 
         reservedpages = 0;
-        for (tmp = ARCH_PFN_OFFSET; tmp < max_mapnr; tmp++)
+        for (tmp = 0; tmp < max_mapnr; tmp++)
                 if (PageReserved(pfn_to_page(tmp)))
                         reservedpages++;
-        freepages =  max_mapnr - ARCH_PFN_OFFSET - reservedpages;
+        freepages =  max_mapnr - reservedpages;
 
         /* do not count in kernel image between _rambase and _ramstart */
         reservedpages -= (_ramstart - _rambase) >> PAGE_SHIFT;
@@ -125,7 +126,7 @@ void __init mem_init(void)
         printk(KERN_INFO
              "Memory available: %luk/%luk RAM, "
                 "(%uk init code, %uk kernel code, %uk data, %uk dma, %uk reserved)\n",
-                (unsigned long) freepages << (PAGE_SHIFT-10), (_ramend - CONFIG_PHY_RAM_BASE_ADDRESS) >> 10,
+                (unsigned long) freepages << (PAGE_SHIFT-10), _ramend >> 10,
                 initk, codek, datak, DMA_UNCACHED_REGION >> 10, (reservedpages << (PAGE_SHIFT-10)));
 }
 
diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c
index 1f3b3ef3e10..29d98faa1ef 100644
--- a/arch/blackfin/mm/sram-alloc.c
+++ b/arch/blackfin/mm/sram-alloc.c
@@ -186,45 +186,9 @@ static void __init l1_inst_sram_init(void)
 #endif
 }
 
-#ifdef __ADSPBF60x__
-static irqreturn_t l2_ecc_err(int irq, void *dev_id)
-{
-        int status;
-
-        printk(KERN_ERR "L2 ecc error happened\n");
-        status = bfin_read32(L2CTL0_STAT);
-        if (status & 0x1)
-                printk(KERN_ERR "Core channel error type:0x%x, addr:0x%x\n",
-                        bfin_read32(L2CTL0_ET0), bfin_read32(L2CTL0_EADDR0));
-        if (status & 0x2)
-                printk(KERN_ERR "System channel error type:0x%x, addr:0x%x\n",
-                        bfin_read32(L2CTL0_ET1), bfin_read32(L2CTL0_EADDR1));
-
-        status = status >> 8;
-        if (status)
-                printk(KERN_ERR "L2 Bank%d error, addr:0x%x\n",
-                        status, bfin_read32(L2CTL0_ERRADDR0 + status));
-
-        panic("L2 Ecc error");
-        return IRQ_HANDLED;
-}
-#endif
-
 static void __init l2_sram_init(void)
 {
 #if L2_LENGTH != 0
-
-#ifdef __ADSPBF60x__
-        int ret;
-
-        ret = request_irq(IRQ_L2CTL0_ECC_ERR, l2_ecc_err, 0, "l2-ecc-err",
-                        NULL);
-        if (unlikely(ret < 0)) {
-                printk(KERN_INFO "Fail to request l2 ecc error interrupt");
-                return;
-        }
-#endif
-
         free_l2_sram_head.next =
                 kmem_cache_alloc(sram_piece_cache, GFP_KERNEL);
         if (!free_l2_sram_head.next) {