3 files changed, 9 insertions(+), 16 deletions(-)

M pc/clock.c
M pc/fns.h
M pc/main.c

@@ 133,12 133,6 @@ printcpufreq(void)
 		cpumhz, cputype->name, cpuidax, cpuiddx);
 }
 
-int
-x86(void)
-{
-	return cputype->family;
-}
-
 void
 clockinit(void)
 {


@@ 164,6 158,15 @@ clockinit(void)
 			break;
 	cputype = t;
 
+	switch(cputype->family){
+	case 3:
+		conf.copymode = 1;	/* copy on reference */
+		break;
+	default:
+		conf.copymode = 0;	/* copy on write */
+		break;
+	}
+
 	/*
 	 *  set clock for 1/HZ seconds
 	 */

@@ 94,7 94,6 @@ void	uartpoll(void);
 void	vgainit(void);
 void	vgasavecrash(uchar*, int);
 void	vgarestorecrash(uchar*, int);
-int	x86(void);
 int	x86cpuid(int*, int*);
 int	xchgw(ushort*, int);
 

@@ 386,7 386,6 @@ confinit(void)
 		nconf++;
 	}
 
-
 	/*
 	 *  size memory above 1 meg. Kernel sits at 1 meg.  We
 	 *  only recognize MB size chunks.


@@ 485,14 484,6 @@ confinit(void)
 	conf.monitor = 1;
 	conf.nswap = conf.nproc*80;
 	conf.nimage = 50;
-	switch(x86()){
-	case 3:
-		conf.copymode = 1;	/* copy on reference */
-		break;
-	default:
-		conf.copymode = 0;	/* copy on write */
-		break;
-	}
 	conf.nfloppy = 2;
 	conf.nhard = 2;
 	conf.nmach = 1;