Blackfin: fix handling of initial L1 reservation

This restores some L1 reservation logic that was lost during the Blackfin
SMP merge.

Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

1 files changed, 10 insertions, 2 deletions

diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c
index 36376d8418fa..fa54a4ee3d6c 100644
--- a/arch/blackfin/mm/sram-alloc.c
+++ b/arch/blackfin/mm/sram-alloc.c
@@ -83,6 +83,14 @@ static struct kmem_cache *sram_piece_cache;
 static void __init l1sram_init(void)
 {
         unsigned int cpu;
+        unsigned long reserve;
+
+#ifdef CONFIG_SMP
+        reserve = 0;
+#else
+        reserve = sizeof(struct l1_scratch_task_info);
+#endif
+
         for (cpu = 0; cpu < num_possible_cpus(); ++cpu) {
                 per_cpu(free_l1_ssram_head, cpu).next =
                         kmem_cache_alloc(sram_piece_cache, GFP_KERNEL);
@@ -91,8 +99,8 @@ static void __init l1sram_init(void)
                         return;
                 }
 
-                per_cpu(free_l1_ssram_head, cpu).next->paddr = (void *)get_l1_scratch_start_cpu(cpu);
-                per_cpu(free_l1_ssram_head, cpu).next->size = L1_SCRATCH_LENGTH;
+                per_cpu(free_l1_ssram_head, cpu).next->paddr = (void *)get_l1_scratch_start_cpu(cpu) + reserve;
+                per_cpu(free_l1_ssram_head, cpu).next->size = L1_SCRATCH_LENGTH - reserve;
                 per_cpu(free_l1_ssram_head, cpu).next->pid = 0;
                 per_cpu(free_l1_ssram_head, cpu).next->next = NULL;