patch-2.1.17 linux/arch/sparc/kernel/time.c

• Lines: 56
• Date: Thu Dec 19 11:03:32 1996
• Orig file: v2.1.16/linux/arch/sparc/kernel/time.c
• Orig date: Wed Dec 18 15:58:46 1996

diff -u --recursive --new-file v2.1.16/linux/arch/sparc/kernel/time.c linux/arch/sparc/kernel/time.c
@@ -1,4 +1,4 @@
-/* $Id: time.c,v 1.20 1996/11/13 05:09:40 davem Exp $
+/* $Id: time.c,v 1.22 1996/12/19 08:06:32 davem Exp $
  * linux/arch/sparc/kernel/time.c
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -25,11 +25,6 @@
 #include <asm/irq.h>
 #include <asm/io.h>
 
-#ifdef CONFIG_AP1000
-#include <asm/ap1000/apservice.h>
-#endif
-
-
 enum sparc_clock_type sp_clock_typ;
 struct mostek48t02 *mstk48t02_regs = 0;
 struct mostek48t08 *mstk48t08_regs = 0;
@@ -162,6 +157,8 @@
 	char model[128];
 	register int node, cpuunit, bootbus;
 
+	cpuunit = bootbus = 0;
+
 	/* Determine the correct starting PROM node for the probe. */
 	node = prom_getchild(prom_root_node);
 	switch (sparc_cpu_model) {
@@ -244,11 +241,7 @@
 
 #if CONFIG_AP1000
 	init_timers(timer_interrupt);
-	{
-	  extern struct cap_init cap_init;
-	  xtime.tv_sec = cap_init.init_time;
-	  xtime.tv_usec = 0;
-	}
+	ap_init_time(&xtime);
         return;
 #endif
 
@@ -273,7 +266,6 @@
 	return;
 }
 
-#if !CONFIG_AP1000
 static __inline__ unsigned long do_gettimeoffset(void)
 {
 	unsigned long offset = 0;
@@ -286,7 +278,6 @@
 
 	return offset + count;
 }
-#endif
 
 void do_gettimeofday(struct timeval *tv)
 {