CVS Update@linux-mips.org: linux

[ths@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ths@ftp.linux-mips.org  05/01/10 01:17:37

Modified files:
        arch/mips/sgi-ip32: ip32-reset.c 

Log message:
        Fix race condition between timer setup and IRQ request.

diff -urN linux/arch/mips/sgi-ip32/ip32-reset.c 
linux/arch/mips/sgi-ip32/ip32-reset.c
--- linux/arch/mips/sgi-ip32/ip32-reset.c       2004/08/31 16:49:32     1.8
+++ linux/arch/mips/sgi-ip32/ip32-reset.c       2005/01/10 01:17:37     1.9
@@ -189,11 +189,13 @@
        _machine_restart = ip32_machine_restart;
        _machine_halt = ip32_machine_halt;
        _machine_power_off = ip32_machine_power_off;
-       request_irq(MACEISA_RTC_IRQ, ip32_rtc_int, 0, "rtc", NULL);
+
        init_timer(&blink_timer);
        blink_timer.function = blink_timeout;
        notifier_chain_register(&panic_notifier_list, &panic_block);
 
+       request_irq(MACEISA_RTC_IRQ, ip32_rtc_int, 0, "rtc", NULL);
+
        return 0;
 }