Re: [PATCH 1/3] High-res-timers part 1 (core) take 13

From: Skip Ford (skip.ford@verizon.net)
Date: Wed Nov 06 2002 - 03:27:46 EST

george anzinger wrote:
>
> - tvec_base_t *old_base, *new_base;
> + tvec_base_t *new_base;
> + IF_SMP( tvec_base_t *old_base;)

Your code doesn't compile. old_base only exists ifdef CONFIG_SMP but
it's referneced for UP compiles @ timer.c:line 332

        if (old_base) {
                list_del(&timer->entry);
                ret = 1;
        }

ifdeffing it out works but I don't know if it's correct. That's one
ugly function with your patch applied so one more ifdef won't hurt
(unless it's wrong.)

--- linux-sk/kernel/timer.c~fix-high-res Wed Nov 6 03:14:30 2002
+++ linux-sk-jr/kernel/timer.c Wed Nov 6 03:14:30 2002
@@ -329,10 +329,12 @@ repeat:
          * Delete the previous timeout (if there was any), and install
          * the new one:
          */
+#ifdef CONFIG_SMP
         if (old_base) {
                 list_del(&timer->entry);
                 ret = 1;
         }
+#endif
         timer->expires = expires;
         IF_HIGH_RES(timer->sub_expires = sub_expires);
         internal_add_timer(new_base, timer); 

-- 
Skip
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Thu Nov 07 2002 - 22:00:42 EST