Messages in this thread Patch in this message | | | From | James Nelson <> | Subject | [PATCH 2/2] frv: replace cli()/sti() in arch/frv/kernel/pm.c | Date | Tue, 11 Jan 2005 15:39:22 -0600 |
| |
Signed-off-by: James Nelson <james4765@gmail.com>
diff -urN --exclude='*~' linux-2.6.10-mm2-original/arch/frv/kernel/pm.c linux-2.6.10-mm2/arch/frv/kernel/pm.c --- linux-2.6.10-mm2-original/arch/frv/kernel/pm.c 2005-01-08 12:16:28.000000000 -0500 +++ linux-2.6.10-mm2/arch/frv/kernel/pm.c 2005-01-08 12:28:00.000000000 -0500 @@ -36,7 +36,7 @@ int pm_do_suspend(void) { - cli(); + local_irq_disable(); __set_LEDS(0xb1); @@ -45,7 +45,7 @@ __set_LEDS(0xb2); - sti(); + local_irq_enable(); return 0; } @@ -84,7 +84,7 @@ int pm_do_bus_sleep(void) { - cli(); + local_irq_disable(); /* * Here is where we need some platform-dependent setup @@ -113,7 +113,7 @@ */ __power_switch_wake_cleanup(); - sti(); + local_irq_enable(); return 0; } @@ -191,7 +191,7 @@ 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 @@ 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); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |