1 files changed, 9 insertions, 7 deletions

diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 01f98cb964d2..6a660fa921b5 100644
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/smp_lock.h>
 #include <linux/unistd.h>
 #include <linux/user.h>
 #include <linux/uaccess.h>
@@ -65,11 +64,11 @@ static void default_idle(void)
 #ifdef CONFIG_IPIPE
         ipipe_suspend_domain();
 #endif
-        local_irq_disable_hw();
+        hard_local_irq_disable();
         if (!need_resched())
                 idle_with_irq_disabled();
 
-        local_irq_enable_hw();
+        hard_local_irq_enable();
 }
 
 /*
@@ -172,10 +171,8 @@ asmlinkage int bfin_clone(struct pt_regs *regs)
         unsigned long newsp;
 
 #ifdef __ARCH_SYNC_CORE_DCACHE
-        if (current->rt.nr_cpus_allowed == num_possible_cpus()) {
-                current->cpus_allowed = cpumask_of_cpu(smp_processor_id());
-                current->rt.nr_cpus_allowed = 1;
-        }
+        if (current->rt.nr_cpus_allowed == num_possible_cpus())
+                set_cpus_allowed_ptr(current, cpumask_of(smp_processor_id()));
 #endif
 
         /* syscall2 puts clone_flags in r0 and usp in r1 */
@@ -493,6 +490,11 @@ int _access_ok(unsigned long addr, unsigned long size)
                 return 1;
 #endif
 
+#ifndef CONFIG_EXCEPTION_L1_SCRATCH
+        if (in_mem_const(addr, size, (unsigned long)l1_stack_base, l1_stack_len))
+                return 1;
+#endif
+
         aret = in_async(addr, size);
         if (aret < 2)
                 return aret;