1 files changed, 12 insertions, 19 deletions

diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c
index f068c11ea98f..627e04b5ba9a 100644
--- a/arch/blackfin/mm/sram-alloc.c
+++ b/arch/blackfin/mm/sram-alloc.c
@@ -17,6 +17,7 @@
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/rtc.h>
+#include <linux/slab.h>
 #include <asm/blackfin.h>
 #include <asm/mem_map.h>
 #include "blackfin_sram.h"
@@ -255,7 +256,8 @@ static void *_sram_alloc(size_t size, struct sram_piece *pfree_head,
                 plast->next = pslot->next;
                 pavail = pslot;
         } else {
-                pavail = kmem_cache_alloc(sram_piece_cache, GFP_KERNEL);
+                /* use atomic so our L1 allocator can be used atomically */
+                pavail = kmem_cache_alloc(sram_piece_cache, GFP_ATOMIC);
 
                 if (!pavail)
                         return NULL;
@@ -402,7 +404,7 @@ void *l1_data_A_sram_alloc(size_t size)
         void *addr;
         unsigned int cpu;
 
-        cpu = get_cpu();
+        cpu = smp_processor_id();
         /* add mutex operation */
         spin_lock_irqsave(&per_cpu(l1_data_sram_lock, cpu), flags);
 
@@ -411,7 +413,6 @@ void *l1_data_A_sram_alloc(size_t size)
 
         /* add mutex operation */
         spin_unlock_irqrestore(&per_cpu(l1_data_sram_lock, cpu), flags);
-        put_cpu();
 
         pr_debug("Allocated address in l1_data_A_sram_alloc is 0x%lx+0x%lx\n",
                  (long unsigned int)addr, size);
@@ -430,7 +431,7 @@ int l1_data_A_sram_free(const void *addr)
         int ret;
         unsigned int cpu;
 
-        cpu = get_cpu();
+        cpu = smp_processor_id();
         /* add mutex operation */
         spin_lock_irqsave(&per_cpu(l1_data_sram_lock, cpu), flags);
 
@@ -439,7 +440,6 @@ int l1_data_A_sram_free(const void *addr)
 
         /* add mutex operation */
         spin_unlock_irqrestore(&per_cpu(l1_data_sram_lock, cpu), flags);
-        put_cpu();
 
         return ret;
 #else
@@ -455,7 +455,7 @@ void *l1_data_B_sram_alloc(size_t size)
         void *addr;
         unsigned int cpu;
 
-        cpu = get_cpu();
+        cpu = smp_processor_id();
         /* add mutex operation */
         spin_lock_irqsave(&per_cpu(l1_data_sram_lock, cpu), flags);
 
@@ -464,7 +464,6 @@ void *l1_data_B_sram_alloc(size_t size)
 
         /* add mutex operation */
         spin_unlock_irqrestore(&per_cpu(l1_data_sram_lock, cpu), flags);
-        put_cpu();
 
         pr_debug("Allocated address in l1_data_B_sram_alloc is 0x%lx+0x%lx\n",
                  (long unsigned int)addr, size);
@@ -483,7 +482,7 @@ int l1_data_B_sram_free(const void *addr)
         int ret;
         unsigned int cpu;
 
-        cpu = get_cpu();
+        cpu = smp_processor_id();
         /* add mutex operation */
         spin_lock_irqsave(&per_cpu(l1_data_sram_lock, cpu), flags);
 
@@ -492,7 +491,6 @@ int l1_data_B_sram_free(const void *addr)
 
         /* add mutex operation */
         spin_unlock_irqrestore(&per_cpu(l1_data_sram_lock, cpu), flags);
-        put_cpu();
 
         return ret;
 #else
@@ -540,7 +538,7 @@ void *l1_inst_sram_alloc(size_t size)
         void *addr;
         unsigned int cpu;
 
-        cpu = get_cpu();
+        cpu = smp_processor_id();
         /* add mutex operation */
         spin_lock_irqsave(&per_cpu(l1_inst_sram_lock, cpu), flags);
 
@@ -549,7 +547,6 @@ void *l1_inst_sram_alloc(size_t size)
 
         /* add mutex operation */
         spin_unlock_irqrestore(&per_cpu(l1_inst_sram_lock, cpu), flags);
-        put_cpu();
 
         pr_debug("Allocated address in l1_inst_sram_alloc is 0x%lx+0x%lx\n",
                  (long unsigned int)addr, size);
@@ -568,7 +565,7 @@ int l1_inst_sram_free(const void *addr)
         int ret;
         unsigned int cpu;
 
-        cpu = get_cpu();
+        cpu = smp_processor_id();
         /* add mutex operation */
         spin_lock_irqsave(&per_cpu(l1_inst_sram_lock, cpu), flags);
 
@@ -577,7 +574,6 @@ int l1_inst_sram_free(const void *addr)
 
         /* add mutex operation */
         spin_unlock_irqrestore(&per_cpu(l1_inst_sram_lock, cpu), flags);
-        put_cpu();
 
         return ret;
 #else
@@ -593,7 +589,7 @@ void *l1sram_alloc(size_t size)
         void *addr;
         unsigned int cpu;
 
-        cpu = get_cpu();
+        cpu = smp_processor_id();
         /* add mutex operation */
         spin_lock_irqsave(&per_cpu(l1sram_lock, cpu), flags);
 
@@ -602,7 +598,6 @@ void *l1sram_alloc(size_t size)
 
         /* add mutex operation */
         spin_unlock_irqrestore(&per_cpu(l1sram_lock, cpu), flags);
-        put_cpu();
 
         return addr;
 }
@@ -614,7 +609,7 @@ void *l1sram_alloc_max(size_t *psize)
         void *addr;
         unsigned int cpu;
 
-        cpu = get_cpu();
+        cpu = smp_processor_id();
         /* add mutex operation */
         spin_lock_irqsave(&per_cpu(l1sram_lock, cpu), flags);
 
@@ -623,7 +618,6 @@ void *l1sram_alloc_max(size_t *psize)
 
         /* add mutex operation */
         spin_unlock_irqrestore(&per_cpu(l1sram_lock, cpu), flags);
-        put_cpu();
 
         return addr;
 }
@@ -635,7 +629,7 @@ int l1sram_free(const void *addr)
         int ret;
         unsigned int cpu;
 
-        cpu = get_cpu();
+        cpu = smp_processor_id();
         /* add mutex operation */
         spin_lock_irqsave(&per_cpu(l1sram_lock, cpu), flags);
 
@@ -644,7 +638,6 @@ int l1sram_free(const void *addr)
 
         /* add mutex operation */
         spin_unlock_irqrestore(&per_cpu(l1sram_lock, cpu), flags);
-        put_cpu();
 
         return ret;
 }