aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-26 19:05:42 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-26 19:05:42 -0400
commit6671de344cd661453bbee3cfde5574a974332436 (patch)
tree826873ae0180eea53b8fcc6e41938b67c656ba3f /drivers/infiniband
parent831576fe40f4175e0767623cffa4aeb28157943a (diff)
parent7c526e1fef8d604a9ec022d9145bba5dbfe40a11 (diff)
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits) posix timers: fix RLIMIT_CPU && fork() time: ntp: fix bug in ntp_update_offset() & do_adjtimex(), fix time: ntp: clean up second_overflow() time: ntp: simplify ntp_tick_adj calculations time: ntp: make 64-bit constants more robust time: ntp: refactor do_adjtimex() some more time: ntp: refactor do_adjtimex() time: ntp: fix bug in ntp_update_offset() & do_adjtimex() time: ntp: micro-optimize ntp_update_offset() time: ntp: simplify ntp_update_offset_fll() time: ntp: refactor and clean up ntp_update_offset() time: ntp: refactor up ntp_update_frequency() time: ntp: clean up ntp_update_frequency() time: ntp: simplify the MAX_TICKADJ_SCALED definition time: ntp: simplify the second_overflow() code flow time: ntp: clean up kernel/time/ntp.c x86: hpet: stop HPET_COUNTER when programming periodic mode x86: hpet: provide separate functions to stop and start the counter x86: hpet: print HPET registers during setup (if hpet=verbose is used) time: apply NTP frequency/tick changes immediately ...
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/hw/ipath/ipath_driver.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index 69c0ce321b4e..cb9daa6ac029 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -2715,7 +2715,7 @@ static void ipath_hol_signal_up(struct ipath_devdata *dd)
2715 * to prevent HoL blocking, then start the HoL timer that 2715 * to prevent HoL blocking, then start the HoL timer that
2716 * periodically continues, then stop procs, so they can detect 2716 * periodically continues, then stop procs, so they can detect
2717 * link down if they want, and do something about it. 2717 * link down if they want, and do something about it.
2718 * Timer may already be running, so use __mod_timer, not add_timer. 2718 * Timer may already be running, so use mod_timer, not add_timer.
2719 */ 2719 */
2720void ipath_hol_down(struct ipath_devdata *dd) 2720void ipath_hol_down(struct ipath_devdata *dd)
2721{ 2721{
@@ -2724,7 +2724,7 @@ void ipath_hol_down(struct ipath_devdata *dd)
2724 dd->ipath_hol_next = IPATH_HOL_DOWNCONT; 2724 dd->ipath_hol_next = IPATH_HOL_DOWNCONT;
2725 dd->ipath_hol_timer.expires = jiffies + 2725 dd->ipath_hol_timer.expires = jiffies +
2726 msecs_to_jiffies(ipath_hol_timeout_ms); 2726 msecs_to_jiffies(ipath_hol_timeout_ms);
2727 __mod_timer(&dd->ipath_hol_timer, dd->ipath_hol_timer.expires); 2727 mod_timer(&dd->ipath_hol_timer, dd->ipath_hol_timer.expires);
2728} 2728}
2729 2729
2730/* 2730/*
@@ -2763,7 +2763,7 @@ void ipath_hol_event(unsigned long opaque)
2763 else { 2763 else {
2764 dd->ipath_hol_timer.expires = jiffies + 2764 dd->ipath_hol_timer.expires = jiffies +
2765 msecs_to_jiffies(ipath_hol_timeout_ms); 2765 msecs_to_jiffies(ipath_hol_timeout_ms);
2766 __mod_timer(&dd->ipath_hol_timer, 2766 mod_timer(&dd->ipath_hol_timer,
2767 dd->ipath_hol_timer.expires); 2767 dd->ipath_hol_timer.expires);
2768 } 2768 }
2769} 2769}