diff options
Diffstat (limited to 'arch/blackfin/kernel/process.c')
-rw-r--r-- | arch/blackfin/kernel/process.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c index 8dd0416673cb..c0f4fe287eb6 100644 --- a/arch/blackfin/kernel/process.c +++ b/arch/blackfin/kernel/process.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <asm/blackfin.h> | 19 | #include <asm/blackfin.h> |
20 | #include <asm/fixed_code.h> | 20 | #include <asm/fixed_code.h> |
21 | #include <asm/mem_map.h> | 21 | #include <asm/mem_map.h> |
22 | #include <asm/irq.h> | ||
22 | 23 | ||
23 | asmlinkage void ret_from_fork(void); | 24 | asmlinkage void ret_from_fork(void); |
24 | 25 | ||
@@ -94,9 +95,7 @@ void cpu_idle(void) | |||
94 | idle(); | 95 | idle(); |
95 | rcu_idle_exit(); | 96 | rcu_idle_exit(); |
96 | tick_nohz_idle_exit(); | 97 | tick_nohz_idle_exit(); |
97 | preempt_enable_no_resched(); | 98 | schedule_preempt_disabled(); |
98 | schedule(); | ||
99 | preempt_disable(); | ||
100 | } | 99 | } |
101 | } | 100 | } |
102 | 101 | ||