diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-03-28 21:45:31 (GMT) |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-03-28 21:45:31 (GMT) |
| commit | c309f7f46167e85d1aae2fd31f23e7d2b5cdfbe0 (patch) | |
| tree | 130ae74f0178a73302ea47dfb29403c68875f403 /arch/arm/mach-omap2/cpuidle44xx.c | |
| parent | cdcbdfb290b7b15315bf92fb5c339d0a8b32debf (diff) | |
| parent | fd1c07861491abf5e0e9ca06799bb5c48f99b64d (diff) | |
| download | linux-c309f7f46167e85d1aae2fd31f23e7d2b5cdfbe0.tar.xz | |
Merge branch 'for_3.10/omap_generic_cleanup_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux into omap-for-v3.10/cleanup-v2
Diffstat (limited to 'arch/arm/mach-omap2/cpuidle44xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/cpuidle44xx.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c index d639aef..944e64a 100644 --- a/arch/arm/mach-omap2/cpuidle44xx.c +++ b/arch/arm/mach-omap2/cpuidle44xx.c @@ -70,10 +70,7 @@ static int omap4_enter_idle_simple(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { - local_fiq_disable(); omap_do_wfi(); - local_fiq_enable(); - return index; } @@ -84,8 +81,6 @@ static int omap4_enter_idle_coupled(struct cpuidle_device *dev, struct omap4_idle_statedata *cx = &omap4_idle_data[index]; int cpu_id = smp_processor_id(); - local_fiq_disable(); - /* * CPU0 has to wait and stay ON until CPU1 is OFF state. * This is necessary to honour hardware recommondation @@ -158,8 +153,6 @@ fail: cpuidle_coupled_parallel_barrier(dev, &abort_barrier); cpu_done[dev->cpu] = false; - local_fiq_enable(); - return index; } |