From e92eb7cc8858189f7ee72ac329da218e5a192231 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sat, 27 May 1995 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1995-05-27

---
 pc/clock.c | 15 +++++++++------
 pc/fns.h   |  1 -
 pc/main.c  |  9 ---------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/pc/clock.c b/pc/clock.c
index 8942583c7de4f9ee1b160cca1b5643cb01dbf7ef..1f5a9f150ad744baa7dbb37acc9b4c2984b2451f 100644
--- a/pc/clock.c
+++ b/pc/clock.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
 	 */
diff --git a/pc/fns.h b/pc/fns.h
index 03c4578abc7e651d42d2618d3dd706bbacf4575a..297fd3e0f9a2f9807ad1d3b74bccb2512c2963bf 100644
--- a/pc/fns.h
+++ b/pc/fns.h
@@ -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);
 
diff --git a/pc/main.c b/pc/main.c
index de3d8ac44f6cf0e0df5036813be5b0dae64d5417..98c5cf07807914e9a23cf44f74a5b90f7cfd352c 100644
--- a/pc/main.c
+++ b/pc/main.c
@@ -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;