Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[pandora-kernel.git] / arch / blackfin / kernel / process.c

diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 01f98cb..cd0c090 100644 (file)
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -65,11 +65,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();
 }
 
 /*
@@ -493,6 +493,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;