Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[mv-sheeva.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index b04dc03b5934596a3b87a83207bfcee51c732714..6b812c04737b5b611c9d40257f8c3b28292955c4 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -215,21 +215,19 @@ int __mod_timer(struct timer_list *timer, unsigned long expires)
                 * handler yet has not finished. This also guarantees that
                 * the timer is serialized wrt itself.
                 */
-               if (unlikely(base->running_timer == timer)) {
-                       /* The timer remains on a former base */
-                       new_base = base;
-               } else {
+               if (likely(base->running_timer != timer)) {
                        /* See the comment in lock_timer_base() */
                        timer->base = NULL;
                        spin_unlock(&base->lock);
-                       spin_lock(&new_base->lock);
-                       timer->base = new_base;
+                       base = new_base;
+                       spin_lock(&base->lock);
+                       timer->base = base;
                }
        }
 
        timer->expires = expires;
-       internal_add_timer(new_base, timer);
-       spin_unlock_irqrestore(&new_base->lock, flags);
+       internal_add_timer(base, timer);
+       spin_unlock_irqrestore(&base->lock, flags);
 
        return ret;
 }
@@ -827,7 +825,7 @@ void update_process_times(int user_tick)
  */
 static unsigned long count_active_tasks(void)
 {
-       return (nr_running() + nr_uninterruptible()) * FIXED_1;
+       return nr_active() * FIXED_1;
 }
 
 /*