summaryrefslogtreecommitdiff
path: root/sys/arch/vax
diff options
context:
space:
mode:
authorHugh Graham <hugh@cvs.openbsd.org>2003-04-08 14:53:12 +0000
committerHugh Graham <hugh@cvs.openbsd.org>2003-04-08 14:53:12 +0000
commit467b6213ed4a051396f286ee6d9a6b5555fbd5f9 (patch)
tree89928f3d742b2e931202119eae18fb840c13812e /sys/arch/vax
parent0bbfb0def841ba4ad0f6ef53402910279b2b913b (diff)
Move definition of storage for cpu_model to locore.c so sizeof has
something meaningful to chew on. Shine on you crazy diamond.
Diffstat (limited to 'sys/arch/vax')
-rw-r--r--sys/arch/vax/vax/locore.c4
-rw-r--r--sys/arch/vax/vax/machdep.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/vax/vax/locore.c b/sys/arch/vax/vax/locore.c
index 3cc1e8a6c92..809fc0ce449 100644
--- a/sys/arch/vax/vax/locore.c
+++ b/sys/arch/vax/vax/locore.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.c,v 1.27 2003/04/06 18:54:20 ho Exp $ */
+/* $OpenBSD: locore.c,v 1.28 2003/04/08 14:53:11 hugh Exp $ */
/* $NetBSD: locore.c,v 1.43 2000/03/26 11:39:45 ragge Exp $ */
/*
* Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
@@ -57,6 +57,7 @@ void main(void);
extern paddr_t avail_end;
paddr_t esym;
u_int proc0paddr;
+char cpu_model[100];
/*
* The strict cpu-dependent information is set up here, in
@@ -87,7 +88,6 @@ extern struct cpu_dep ka680_calls;
void
start(struct rpb *prpb)
{
- extern char cpu_model[];
extern void *scratch;
struct pte *pt;
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index 0d52dd531c3..b6afab22d8d 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.63 2002/12/17 23:11:32 millert Exp $ */
+/* $OpenBSD: machdep.c,v 1.64 2003/04/08 14:53:11 hugh Exp $ */
/* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */
/*
@@ -148,7 +148,6 @@ extern int virtual_avail, virtual_end;
int want_resched;
char machine[] = MACHINE; /* from <machine/param.h> */
char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
-char cpu_model[100];
int physmem;
int dumpsize = 0;
int cold = 1; /* coldstart */
@@ -179,6 +178,7 @@ cpu_startup()
vm_offset_t minaddr, maxaddr;
vm_size_t size;
extern unsigned int avail_end;
+ extern char cpu_model[];
/*
* Initialize error message buffer.