Index: linus/arch/ia64/kernel/fsys.S
===================================================================
--- linus.orig/arch/ia64/kernel/fsys.S	2004-10-13 09:49:55.000000000 -0700
+++ linus/arch/ia64/kernel/fsys.S	2004-10-13 09:49:55.000000000 -0700
@@ -234,7 +234,7 @@
 	cmp.eq p9,p0 = 1,r8	// MMIO64 ?
 	extr r2 = r21,24,8	// time_interpolator->jitter
 	cmp.eq p10,p0 = 2,r8	// MMIO32 ?
-	cmp.lt p11,p0 = 2,r8	// function?
+	cmp.ltu p11,p0 = 2,r8	// function or other clock
 (p11)	br.cond.spnt.many fsys_fallback_syscall
 	;;
 	setf.sig f7 = r3	// Setup for scaling of counter
@@ -338,7 +338,7 @@
 	.prologue
 	.altrp b6
 	.body
-	cmp4.lt p6, p0 = CLOCK_MONOTONIC, r32
+	cmp4.ltu p6, p0 = CLOCK_MONOTONIC, r32
 	// Fallback if this is not CLOCK_REALTIME or CLOCK_MONOTONIC
 (p6)	br.spnt.few fsys_fallback_syscall
 	mov r31 = r33
Index: linus/kernel/posix-timers.c
===================================================================
--- linus.orig/kernel/posix-timers.c	2004-09-23 15:12:01.000000000 -0700
+++ linus/kernel/posix-timers.c	2004-10-13 09:50:28.000000000 -0700
@@ -219,11 +219,6 @@
 		.clock_set = do_posix_clock_monotonic_settime
 	};
 
-#ifdef CONFIG_TIME_INTERPOLATION
-	/* Clocks are more accurate with time interpolators */
-	clock_realtime.res = clock_monotonic.res = time_interpolator_resolution();
-#endif
-
 	register_posix_clock(CLOCK_REALTIME, &clock_realtime);
 	register_posix_clock(CLOCK_MONOTONIC, &clock_monotonic);