From 57e10100cd9f0e1583d6ee2a24806c79928675a4 Mon Sep 17 00:00:00 2001
From: Jason Wright <jason@cvs.openbsd.org>
Date: Wed, 12 Feb 2003 06:33:01 +0000
Subject: Kill more commons in sparc64 code

---
 sys/arch/sparc64/include/cpu.h          | 6 +++---
 sys/arch/sparc64/include/db_machdep.h   | 4 ++--
 sys/arch/sparc64/sparc64/cpu.c          | 3 ++-
 sys/arch/sparc64/sparc64/db_interface.c | 4 +++-
 4 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'sys')

diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h
index df075e0ce2d..c2afaecc8d6 100644
--- a/sys/arch/sparc64/include/cpu.h
+++ b/sys/arch/sparc64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.16 2003/02/10 10:47:58 jason Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.17 2003/02/12 06:32:59 jason Exp $	*/
 /*	$NetBSD: cpu.h,v 1.28 2001/06/14 22:56:58 thorpej Exp $ */
 
 /*
@@ -203,13 +203,13 @@ void setsoftint(void);
 void setsoftnet(void);
 #endif
 
-int	want_ast;
+extern	int want_ast;
 
 /*
  * Preempt the current process if in interrupt from user mode,
  * or after the current trap/syscall if in system mode.
  */
-int	want_resched;		/* resched() was called */
+extern	int want_resched;	/* resched() was called */
 #define	need_resched()		(want_resched = 1, want_ast = 1)
 
 /*
diff --git a/sys/arch/sparc64/include/db_machdep.h b/sys/arch/sparc64/include/db_machdep.h
index 1d9e84106e8..7fd7b4fab77 100644
--- a/sys/arch/sparc64/include/db_machdep.h
+++ b/sys/arch/sparc64/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.7 2002/06/15 17:23:31 art Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.8 2003/02/12 06:32:59 jason Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.12 2001/07/07 15:16:13 eeh Exp $ */
 
 /*
@@ -80,7 +80,7 @@ typedef struct db_regs {
 } db_regs_t;
 #endif
 
-db_regs_t		ddb_regs;	/* register state */
+extern	db_regs_t ddb_regs;	/* register state */
 #define	DDB_REGS	(&ddb_regs)
 #define	DDB_TF		(&ddb_regs.ddb_tf)
 #define	DDB_FR		(&ddb_regs.ddb_fr)
diff --git a/sys/arch/sparc64/sparc64/cpu.c b/sys/arch/sparc64/sparc64/cpu.c
index b0e69b39083..cca82cd2307 100644
--- a/sys/arch/sparc64/sparc64/cpu.c
+++ b/sys/arch/sparc64/sparc64/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.10 2003/02/10 10:47:58 jason Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.11 2003/02/12 06:33:00 jason Exp $	*/
 /*	$NetBSD: cpu.c,v 1.13 2001/05/26 21:27:15 chs Exp $ */
 
 /*
@@ -82,6 +82,7 @@ char	cpu_model[100];
 
 struct	proc *fpproc;
 int	foundfpu;
+int	want_ast, want_resched;
 
 /* The CPU configuration driver. */
 static void cpu_attach(struct device *, struct device *, void *);
diff --git a/sys/arch/sparc64/sparc64/db_interface.c b/sys/arch/sparc64/sparc64/db_interface.c
index 7609736d661..f0510e09de8 100644
--- a/sys/arch/sparc64/sparc64/db_interface.c
+++ b/sys/arch/sparc64/sparc64/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.13 2003/01/09 22:27:10 miod Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.14 2003/02/12 06:33:00 jason Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.61 2001/07/31 06:55:47 eeh Exp $ */
 
 /*
@@ -59,6 +59,8 @@
 #include "esp_sbus.h"
 #endif
 
+db_regs_t	ddb_regs;	/* register state */
+
 extern void OF_enter(void);
 
 extern struct traptrace {
-- 
cgit v1.2.3