2003-05-07 04:46:37

by Vinay K Nallamothu

Subject: [PATCH 2.5.69] IA64 sn mod_timer fixes for kernel/mca.c

mca.c: Trivial {del,add}_timer to mod_timer conversion.

Thanks
vinay

--- linux-2.5.69/arch/ia64/sn/kernel/mca.c 2003-03-25 10:07:20.000000000 +0530
+++ linux-2.5.69-nvk/arch/ia64/sn/kernel/mca.c 2003-05-07 10:11:42.000000000 +0530
@@ -246,9 +246,7 @@
void
sn_cpei_timer_handler(unsigned long dummy) {
sn_cpei_handler(-1, NULL, NULL);
- del_timer(&sn_cpei_timer);
- sn_cpei_timer.expires = jiffies + CPEI_INTERVAL;
- add_timer(&sn_cpei_timer);
+ mod_timer(&sn_cpei_timer, jiffies + CPEI_INTERVAL);
}

void
@@ -267,9 +265,7 @@
unsigned long *pi_ce_error_inject_reg = 0xc00000092fffff00;

*pi_ce_error_inject_reg = 0x0000000000000100;
- del_timer(&sn_ce_timer);
- sn_ce_timer.expires = jiffies + CPEI_INTERVAL;
- add_timer(&sn_ce_timer);
+ mod_timer(&sn_ce_timer, jiifies + CPEI_INTERVAL);
}

sn_init_ce_timer() {

2003-05-07 05:40:40

by Andrew Morton

Subject: Re: [PATCH 2.5.69] IA64 sn mod_timer fixes for kernel/mca.c

Vinay K Nallamothu <[email protected]> wrote:
>
> mca.c: Trivial {del,add}_timer to mod_timer conversion.

Please just roll all these up into one big patch.

2003-05-07 19:06:48

by Jesse Barnes

Subject: Re: [Linux-ia64] Re: [PATCH 2.5.69] IA64 sn mod_timer fixes for kernel/mca.c

On Tue, May 06, 2003 at 10:53:07PM -0700, Andrew Morton wrote:
> Vinay K Nallamothu <[email protected]> wrote:
> >
> > mca.c: Trivial {del,add}_timer to mod_timer conversion.
>
> Please just roll all these up into one big patch.

Please also Cc: me on SN changes (and the big patch when you send it
out).

Thanks,
Jesse

2003-05-07 22:57:01

by Alan

Subject: Re: [Linux-ia64] Re: [PATCH 2.5.69] IA64 sn mod_timer fixes for kernel/mca.c

On Mer, 2003-05-07 at 20:19, Jesse Barnes wrote:
> On Tue, May 06, 2003 at 10:53:07PM -0700, Andrew Morton wrote:
> > Vinay K Nallamothu <[email protected]> wrote:
> > >
> > > mca.c: Trivial {del,add}_timer to mod_timer conversion.
> >
> > Please just roll all these up into one big patch.
>
> Please also Cc: me on SN changes (and the big patch when you send it
> out).

You want to go through them one by one. Some are a bit less obvious and
a couple Im not sure about. Most are in my test -ac tree and seem fine