diff options
Diffstat (limited to 'arch/mips/kernel/process.c')
| -rw-r--r-- | arch/mips/kernel/process.c | 8 | 
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index f3d73e1831c..99960940d4a 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -17,7 +17,6 @@  #include <linux/stddef.h>  #include <linux/unistd.h>  #include <linux/ptrace.h> -#include <linux/slab.h>  #include <linux/mman.h>  #include <linux/personality.h>  #include <linux/sys.h> @@ -64,8 +63,13 @@ void __noreturn cpu_idle(void)  			smtc_idle_loop_hook();  #endif -			if (cpu_wait) + +			if (cpu_wait) { +				/* Don't trace irqs off for idle */ +				stop_critical_timings();  				(*cpu_wait)(); +				start_critical_timings(); +			}  		}  #ifdef CONFIG_HOTPLUG_CPU  		if (!cpu_online(cpu) && !cpu_isset(cpu, cpu_callin_map) &&  |