X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Ftimer.c;h=b79489e9577da854c4f7606d7e72945ebfe94497;hb=8e8ece46a861c84343256819eaec77e608ff9217;hp=10af71d9949f55bb99783f2c1bd4fc39ac7877e3;hpb=af20d436230b2df6d73a406b6f1b31ae000775cb;p=linux-2.6.git

diff --git a/kernel/timer.c b/kernel/timer.c
index 10af71d99..b79489e95 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -686,7 +686,11 @@ static void second_overflow(void)
 	if (ltemp > (MAXPHASE / MINSEC) << SHIFT_UPDATE)
 	    ltemp = (MAXPHASE / MINSEC) << SHIFT_UPDATE;
 	time_offset += ltemp;
+	#if SHIFT_SCALE - SHIFT_HZ - SHIFT_UPDATE > 0
 	time_adj = -ltemp << (SHIFT_SCALE - SHIFT_HZ - SHIFT_UPDATE);
+	#else
+	time_adj = -ltemp >> (SHIFT_HZ + SHIFT_UPDATE - SHIFT_SCALE);
+	#endif
     } else {
 	ltemp = time_offset;
 	if (!(time_status & STA_FLL))
@@ -694,7 +698,11 @@ static void second_overflow(void)
 	if (ltemp > (MAXPHASE / MINSEC) << SHIFT_UPDATE)
 	    ltemp = (MAXPHASE / MINSEC) << SHIFT_UPDATE;
 	time_offset -= ltemp;
+	#if SHIFT_SCALE - SHIFT_HZ - SHIFT_UPDATE > 0
 	time_adj = ltemp << (SHIFT_SCALE - SHIFT_HZ - SHIFT_UPDATE);
+	#else
+	time_adj = ltemp >> (SHIFT_HZ + SHIFT_UPDATE - SHIFT_SCALE);
+	#endif
     }
 
     /*
@@ -1231,9 +1239,6 @@ asmlinkage long sys_sysinfo(struct sysinfo __user *info)
 		val.procs = nr_threads;
 	} while (read_seqretry(&xtime_lock, seq));
 
-/*	if (vx_flags(VXF_VIRT_CPU, 0))
-		vx_vsi_cpu(val);
-*/
 	si_meminfo(&val);
 	si_swapinfo(&val);