[LV-k25-commit] kernel-2.5/arch/vax/kernel time.c,1.22,1.23

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21099

Modified Files:
	time.c 
Log Message:
- Call mv->clock_init only if we have one.


Index: time.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/time.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- time.c	9 May 2005 20:09:53 -0000	1.22
+++ time.c	3 Oct 2005 12:41:51 -0000	1.23
@@ -48,10 +48,14 @@
 
 void __init time_init(void)
 {
-	/* initialise the hardware clock */
-	mv->clock_init();
+	/* Initialise the hardware clock */
+	if (mv->clock_init) {
+		printk (KERN_DEBUG "Calling mv->clock_init()\n");
+		mv->clock_init();
+	} else
+		printk (KERN_DEBUG "No mv->clock_init(), so not calling it...\n");
 
-	/* read cmos time */
+	/* Read CMOS time */
 	xtime.tv_nsec = 0;
 	xtime.tv_sec = get_cmos_time();
 	wall_to_monotonic.tv_sec = -xtime.tv_sec;