diff options
| author | Russ Anderson <rja@sgi.com> | 2007-03-30 17:13:18 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-04-06 15:31:33 -0700 |
| commit | fbff71e1ec1c4695d51d496a53228ecdcb6361eb (patch) | |
| tree | d4f9b0477b8218fafff027563cf6b6cb26d98b85 | |
| parent | a21bd69e1509b43823c317c3bf3f7ffa99884356 (diff) | |
| download | op-kernel-dev-fbff71e1ec1c4695d51d496a53228ecdcb6361eb.zip op-kernel-dev-fbff71e1ec1c4695d51d496a53228ecdcb6361eb.tar.gz | |
[IA64] BTE error timer fix
The bte recovery_timer was not being set correctly.
Signed-off-by: Russ Anderson <rja@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/sn/kernel/bte_error.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/sn/kernel/bte_error.c b/arch/ia64/sn/kernel/bte_error.c index f1ec137..b6fcf81 100644 --- a/arch/ia64/sn/kernel/bte_error.c +++ b/arch/ia64/sn/kernel/bte_error.c @@ -78,7 +78,7 @@ int shub1_bte_error_handler(unsigned long _nodepda) * There are errors which still need to be cleaned up by * hubiio_crb_error_handler */ - mod_timer(recovery_timer, HZ * 5); + mod_timer(recovery_timer, jiffies + (HZ * 5)); BTE_PRINTK(("eh:%p:%d Marked Giving up\n", err_nodepda, smp_processor_id())); return 1; @@ -95,7 +95,7 @@ int shub1_bte_error_handler(unsigned long _nodepda) icrbd.ii_icrb0_d_regval = REMOTE_HUB_L(nasid, IIO_ICRB_D(i)); if (icrbd.d_bteop) { - mod_timer(recovery_timer, HZ * 5); + mod_timer(recovery_timer, jiffies + (HZ * 5)); BTE_PRINTK(("eh:%p:%d Valid %d, Giving up\n", err_nodepda, smp_processor_id(), i)); @@ -150,7 +150,7 @@ int shub2_bte_error_handler(unsigned long _nodepda) status = BTE_LNSTAT_LOAD(bte); if ((status & IBLS_ERROR) || !(status & IBLS_BUSY)) continue; - mod_timer(recovery_timer, HZ * 5); + mod_timer(recovery_timer, jiffies + (HZ * 5)); BTE_PRINTK(("eh:%p:%d Marked Giving up\n", err_nodepda, smp_processor_id())); return 1; |
