FRV: cli/sti cleanup
PATCH 1/1 FRV: cli/sti cleanup
The attached patch cleans up the remaining references to the cli() and sti() functions from the FRV arch now they're deprecated.
Signed-off-by David Howells <[email protected]>
---
warthog>diffstat -p1 frv-clisti-cleanup-2611rc3.diff
arch/frv/kernel/irq-routing.c | 4 ++-- arch/frv/kernel/irq.c | 12 ++++++------ arch/frv/kernel/pm.c | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-)
arch/frv/kernel/irq.c renamed from warthog/kernels/linux-2.6.11-rc3/arch/frv/kernel/irq.c +6 -6
@@ -316,16 +316,16 @@ asmlinkage void do_IRQ(void)do_softirq ();#ifdef CONFIG_PREEMPT -cli (); +local_irq_disable ();while (--current->preempt_count ==0 ) { -if (!(__frame->psr &PSR_S ) - || (current->need_resched ==0 ) - ||in_interrupt ()) +if (!(__frame->psr &PSR_S ) || + current->need_resched ==0 || +in_interrupt ())break ; current->preempt_count++; -sti (); +local_irq_enable ();preempt_schedule (); -cli (); +local_irq_disable (); }#endif
arch/frv/kernel/irq-routing.c renamed from warthog/kernels/linux-2.6.11-rc3/arch/frv/kernel/irq-routing.c +2 -2
@@ -82,7 +82,7 @@ void distribute_irqs(struct irq_group *gint status =0 ;// if (!(action->flags & SA_INTERRUPT)) -// sti(); +// local_irq_enable(); do { status |= action->flags;
@@ -92,7 +92,7 @@ void distribute_irqs(struct irq_group *gif (status &SA_SAMPLE_RANDOM )add_interrupt_randomness (irq); -cli (); +local_irq_disable (); } } }
arch/frv/kernel/pm.c renamed from warthog/kernels/linux-2.6.11-rc3/arch/frv/kernel/pm.c +6 -6
@@ -36,7 +36,7 @@ extern void frv_change_cmode(int);int pm_do_suspend (void ) { -cli (); +local_irq_disable ();__set_LEDS (0xb1 );
@@ -45,7 +45,7 @@ int pm_do_suspend(void)__set_LEDS (0xb2 ); -sti (); +local_irq_enable ();return 0 ; }
@@ -84,7 +84,7 @@ void (*__power_switch_wake_cleanup)(voidint pm_do_bus_sleep (void ) { -cli (); +local_irq_disable ();/* * Here is where we need some platform-dependent setup
@@ -113,7 +113,7 @@ int pm_do_bus_sleep(void)*/ __power_switch_wake_cleanup (); -sti (); +local_irq_enable ();return 0 ; }
@@ -191,7 +191,7 @@ static int try_set_cmode(int new_cmode)pm_send_all (PM_SUSPEND , (void *)3 );/* now change cmode */ -cli (); +local_irq_disable ();frv_dma_pause_all ();frv_change_cmode (new_cmode);
@@ -203,7 +203,7 @@ static int try_set_cmode(int new_cmode)determine_clocks (1 );#endif frv_dma_resume_all (); -sti (); +local_irq_enable ();/* tell all the drivers we're resuming */ pm_send_all (PM_RESUME , (void *)0 );