summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1996-05-01 08:31:21 +0000
committerbde <bde@FreeBSD.org>1996-05-01 08:31:21 +0000
commit00b2015fb5a605103d9ba4381b6f2884ee87d5f3 (patch)
treef5bc32a5c4089798c72f1023566484cf1323f0a2 /sys/amd64
parentaa76d4da80b5199be3cafedd3d940987a911966d (diff)
downloadFreeBSD-src-00b2015fb5a605103d9ba4381b6f2884ee87d5f3.zip
FreeBSD-src-00b2015fb5a605103d9ba4381b6f2884ee87d5f3.tar.gz
i386/machdep.c
include/clock.h isa/clock.c
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/amd64/machdep.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index bf14b68..03cf864 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.183 1996/04/25 06:20:10 phk Exp $
+ * $Id: machdep.c,v 1.184 1996/04/26 13:47:39 phk Exp $
*/
#include "npx.h"
@@ -245,6 +245,7 @@ cpu_startup(dummy)
* Good {morning,afternoon,evening,night}.
*/
printf(version);
+ cpu_class = i386_cpus[cpu].cpu_class;
startrtclock();
identifycpu();
printf("real memory = %d (%dK bytes)\n", ptoa(Maxmem), ptoa(Maxmem) / 1024);
@@ -491,20 +492,8 @@ static void
identifycpu()
{
printf("CPU: ");
- if (cpu >= 0
- && cpu < (sizeof i386_cpus/sizeof(struct cpu_nameclass))) {
- cpu_class = i386_cpus[cpu].cpu_class;
- strncpy(cpu_model, i386_cpus[cpu].cpu_name, sizeof cpu_model);
- } else {
- printf("unknown cpu type %d\n", cpu);
- panic("startup: bad cpu id");
- }
+ strncpy(cpu_model, i386_cpus[cpu].cpu_name, sizeof cpu_model);
-#if defined(I586_CPU) || defined(I686_CPU)
- if (cpu_class == CPUCLASS_586 || cpu_class == CPUCLASS_686) {
- calibrate_cyclecounter();
- }
-#endif
#if defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)
if (!strcmp(cpu_vendor,"GenuineIntel")) {
if ((cpu_id & 0xf00) > 3) {
OpenPOWER on IntegriCloud