Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=56e1393f82349d8206fe7feb94db96b065c55e51
Commit:     56e1393f82349d8206fe7feb94db96b065c55e51
Parent:     eea221ce48803a92e2319270b2b7b8e21cd470ca
Author:     Arjan van de Ven <[EMAIL PROTECTED]>
AuthorDate: Tue Mar 6 02:41:48 2007 -0800
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Sat Apr 28 11:00:57 2007 -0400

    user of the jiffies rounding code: e1000
    
    Use the round_jiffies() function in e1000.
    
    These timers all were of the "about once a second" or "about once every X
    seconds" variety and several showed up in the "what wakes the cpu up" 
profiles
    that the tickless patches provide.  Some timers are highly dynamic based on
    network load; but even on low activity systems they still show up so the
    rounding is done only in cases of low activity, allowing higher frequency
    timers in the high activity case.
    
    The various hardware watchdogs are an obvious case; they run every 2 seconds
    but aren't otherwise specific of exactly when they need to run.
    
    Signed-off-by: Arjan van de Ven <[EMAIL PROTECTED]>
    Acked-by: Auke Kok <[EMAIL PROTECTED]>
    Cc: Jeff Garzik <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/e1000/e1000_main.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 9267f16..ed638d6 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2667,7 +2667,7 @@ e1000_watchdog(unsigned long data)
 
                        netif_carrier_on(netdev);
                        netif_wake_queue(netdev);
-                       mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ);
+                       mod_timer(&adapter->phy_info_timer, 
round_jiffies(jiffies + 2 * HZ));
                        adapter->smartspeed = 0;
                } else {
                        /* make sure the receive unit is started */
@@ -2684,7 +2684,7 @@ e1000_watchdog(unsigned long data)
                        DPRINTK(LINK, INFO, "NIC Link is Down\n");
                        netif_carrier_off(netdev);
                        netif_stop_queue(netdev);
-                       mod_timer(&adapter->phy_info_timer, jiffies + 2 * HZ);
+                       mod_timer(&adapter->phy_info_timer, 
round_jiffies(jiffies + 2 * HZ));
 
                        /* 80003ES2LAN workaround--
                         * For packet buffer work-around on link down event;
@@ -2736,7 +2736,7 @@ e1000_watchdog(unsigned long data)
                e1000_rar_set(&adapter->hw, adapter->hw.mac_addr, 0);
 
        /* Reset the timer */
-       mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
+       mod_timer(&adapter->watchdog_timer, round_jiffies(jiffies + 2 * HZ));
 }
 
 enum latency_range {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to