diff options
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/kernel/process.c | 4 | ||||
| -rw-r--r-- | arch/cris/mm/fault.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c index aa585e4e979e..d8f50ff6fadd 100644 --- a/arch/cris/kernel/process.c +++ b/arch/cris/kernel/process.c @@ -115,9 +115,7 @@ void cpu_idle (void) idle = default_idle; idle(); } - preempt_enable_no_resched(); - schedule(); - preempt_disable(); + schedule_preempt_disabled(); } } diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c index 9dcac8ec8fa0..ba9cfbe818f1 100644 --- a/arch/cris/mm/fault.c +++ b/arch/cris/mm/fault.c @@ -111,7 +111,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs, * user context, we must not take the fault. */ - if (in_atomic() || !mm) + if (!mm || pagefault_disabled()) goto no_context; down_read(&mm->mmap_sem); |