diff -urN oldtree/kernel/timer.c newtree/kernel/timer.c
--- oldtree/kernel/timer.c	2006-09-17 07:22:28.000000000 -0400
+++ newtree/kernel/timer.c	2006-09-17 07:35:49.000000000 -0400
@@ -860,7 +860,7 @@
 	for (adj = 0; error > i; adj++)
 		error >>= 1;
 
-        if (sign < 0 && unlikely(clock->mult < clock->mult_min + (1 << adj))) {
+        if (error < 0 && unlikely(clock->mult < clock->mult_min + (1 << adj))) {
                 if (clock->mult <= clock->mult_min)
                        return 0;
                 adj = fls(clock->mult - clock->mult_min) - 1;
Files oldtree/scripts/kconfig/mconf and newtree/scripts/kconfig/mconf differ
