patch-2.4.22 linux-2.4.22/arch/ppc/kernel/time.c

Next file: linux-2.4.22/arch/ppc/kernel/todc_time.c
Previous file: linux-2.4.22/arch/ppc/kernel/temp.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/arch/ppc/kernel/time.c linux-2.4.22/arch/ppc/kernel/time.c
@@ -149,12 +149,12 @@
 		do_IRQ(regs);
 
 	hardirq_enter(cpu);
-	
+
 	while ((next_dec = tb_ticks_per_jiffy - tb_delta(&jiffy_stamp)) < 0) {
 		jiffy_stamp += tb_ticks_per_jiffy;
 		if (!user_mode(regs))
 			ppc_do_profile(instruction_pointer(regs));
-		if (unlikely(!heartbeat_count(cpu)--) 
+		if (unlikely(!heartbeat_count(cpu)--)
 				&& heartbeat_reset(cpu)) {
 			ppc_md.heartbeat();
 			heartbeat_count(cpu) = heartbeat_reset(cpu);
@@ -262,7 +262,7 @@
 	 * harmful to relatively short timers.
 	 */
 
-	/* This works perfectly on SMP only if the tb are in sync but 
+	/* This works perfectly on SMP only if the tb are in sync but
 	 * guarantees an error < 1 jiffy even if they are off by eons,
 	 * still reasonable when gettimeofday resolution is 1 jiffy.
 	 */
@@ -271,13 +271,13 @@
 	new_sec = tv->tv_sec;
 	new_usec = tv->tv_usec - mulhwu(tb_to_us, tb_delta);
 	while (new_usec <0) {
-		new_sec--; 
+		new_sec--;
 		new_usec += 1000000;
 	}
 	xtime.tv_usec = new_usec;
 	xtime.tv_sec = new_sec;
 
-	/* In case of a large backwards jump in time with NTP, we want the 
+	/* In case of a large backwards jump in time with NTP, we want the
 	 * clock to be updated as soon as the PLL is again in lock.
 	 */
 	last_rtc_update = new_sec - 658;
@@ -308,7 +308,7 @@
                 ppc_md.calibrate_decr();
 	}
 
-	/* Now that the decrementer is calibrated, it can be used in case the 
+	/* Now that the decrementer is calibrated, it can be used in case the
 	 * clock is stuck, but the fact that we have to handle the 601
 	 * makes things more complex. Repeatedly read the RTC until the
 	 * next second boundary to try to achieve some precision.  If there
@@ -320,7 +320,7 @@
 		sec = ppc_md.get_rtc_time();
 		elapsed = 0;
 		do {
-			old_stamp = stamp; 
+			old_stamp = stamp;
 			old_sec = sec;
 			stamp = get_native_tbl();
 			if (__USE_RTC() && stamp < old_stamp)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)