Back out the patch to break up the clock probe lines. Instead, follow

Bruce's suggestion of deleting "relative to mc146818A clock ",
thus shortening the line ...

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index 09ba1e5..a63ec9e 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -514,7 +514,7 @@ calibrate_clocks(void)
 	u_int count, prev_count, tot_count;
 	int sec, start_sec, timeout;
 
-	printf("Calibrating clock(s) relative to mc146818A clock.\n");
+	printf("Calibrating clock(s) ... ");
 	if (!(rtcin(RTC_STATUSD) & RTCSD_PWR))
 		goto fail;
 	timeout = 100000000;
@@ -587,15 +587,15 @@ calibrate_clocks(void)
 	 */
 	if (cpu_class == CPUCLASS_586 || cpu_class == CPUCLASS_686) {
 		set_i586_ctr_freq((u_int)rdtsc(), tot_count);
-		printf("  i586 clock: %u Hz,\n", i586_ctr_freq);
+		printf("i586 clock: %u Hz, ", i586_ctr_freq);
 	}
 #endif
 
-	printf("  i8254 clock: %u Hz\n", tot_count);
+	printf("i8254 clock: %u Hz\n", tot_count);
 	return (tot_count);
 
 fail:
-	printf("  Failed, using default i8254 clock of %u Hz\n", timer_freq);
+	printf("failed, using default i8254 clock of %u Hz\n", timer_freq);
 	return (timer_freq);
 }