[src/trunk]: src/sys/arch/vax/vax Remove the use of global "mastercpu", the w...

[ragge <ragge%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/831deb8955db
branches:  trunk
changeset: 495328:831deb8955db
user:      ragge <ragge%NetBSD.org@localhost>
date:      Wed Jul 26 11:44:25 2000 +0000

description:
Remove the use of global "mastercpu", the world is different now.

diffstat:

 sys/arch/vax/vax/autoconf.c |  3 +--
 sys/arch/vax/vax/ka820.c    |  4 +++-
 sys/arch/vax/vax/locore.c   |  3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diffs (59 lines):

diff -r 82f5ddb9008f -r 831deb8955db sys/arch/vax/vax/autoconf.c
--- a/sys/arch/vax/vax/autoconf.c       Wed Jul 26 11:43:07 2000 +0000
+++ b/sys/arch/vax/vax/autoconf.c       Wed Jul 26 11:44:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.66 2000/06/29 07:14:22 mrg Exp $        */
+/*     $NetBSD: autoconf.c,v 1.67 2000/07/26 11:44:26 ragge Exp $      */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -64,7 +64,6 @@
 void   gencnslask __P((void));
 
 struct cpu_dep *dep_call;
-int mastercpu; /* chief of the system */
 struct device *booted_device;
 int booted_partition;  /* defaults to 0 (aka 'a' partition */
 
diff -r 82f5ddb9008f -r 831deb8955db sys/arch/vax/vax/ka820.c
--- a/sys/arch/vax/vax/ka820.c  Wed Jul 26 11:43:07 2000 +0000
+++ b/sys/arch/vax/vax/ka820.c  Wed Jul 26 11:44:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ka820.c,v 1.27 2000/06/29 07:14:28 mrg Exp $   */
+/*     $NetBSD: ka820.c,v 1.28 2000/07/26 11:44:25 ragge Exp $ */
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -75,6 +75,7 @@
 struct ka820port *ka820port_ptr;
 struct rx50device *rx50device_ptr;
 static volatile struct ka820clock *ka820_clkpage;
+static int mastercpu;
 
 static int ka820_match(struct device *, struct cfdata *, void *);
 static void ka820_attach(struct device *, struct device *, void*);
@@ -156,6 +157,7 @@
        u_short rev;
 
        rev = bus_space_read_4(ba->ba_iot, ba->ba_ioh, BIREG_DTYPE) >> 16;
+       mastercpu = mfpr(PR_BINID);
        strcpy(cpu_model, "VAX 8200");
        cpu_model[6] = rev & 0x8000 ? '5' : '0';
        printf(": ka82%c (%s) cpu rev %d, u patch rev %d, sec patch %d\n",
diff -r 82f5ddb9008f -r 831deb8955db sys/arch/vax/vax/locore.c
--- a/sys/arch/vax/vax/locore.c Wed Jul 26 11:43:07 2000 +0000
+++ b/sys/arch/vax/vax/locore.c Wed Jul 26 11:44:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.c,v 1.50 2000/07/19 18:15:03 matt Exp $ */
+/*     $NetBSD: locore.c,v 1.51 2000/07/26 11:44:25 ragge Exp $        */
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -220,7 +220,6 @@
 #endif
 #if VAX8200
        case VAX_BTYP_8000:
-               mastercpu = mfpr(PR_BINID);
                dep_call = &ka820_calls;
                strcpy(cpu_model, "VAX 8200");
                break;