[src/trunk]: src/sys/arch/i386 Eliminate commons.

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

details:   https://anonhg.NetBSD.org/src/rev/9fe543fa3162
branches:  trunk
changeset: 526862:9fe543fa3162
user:      matt <matt%NetBSD.org@localhost>
date:      Sun May 12 23:16:52 2002 +0000

description:
Eliminate commons.

diffstat:

 sys/arch/i386/i386/db_interface.c  |   5 +++--
 sys/arch/i386/i386/machdep.c       |  12 +++++++++---
 sys/arch/i386/include/cpu.h        |   4 ++--
 sys/arch/i386/include/db_machdep.h |   4 ++--
 sys/arch/i386/include/intr.h       |   6 +++---
 sys/arch/i386/include/pcb.h        |   4 ++--
 6 files changed, 21 insertions(+), 14 deletions(-)

diffs (147 lines):

diff -r d25a66386f4e -r 9fe543fa3162 sys/arch/i386/i386/db_interface.c
--- a/sys/arch/i386/i386/db_interface.c Sun May 12 23:15:42 2002 +0000
+++ b/sys/arch/i386/i386/db_interface.c Sun May 12 23:16:52 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_interface.c,v 1.33 2001/11/15 07:03:29 lukem Exp $  */
+/*     $NetBSD: db_interface.c,v 1.34 2002/05/12 23:16:53 matt Exp $   */
 
 /* 
  * Mach Operating System
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.33 2001/11/15 07:03:29 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.34 2002/05/12 23:16:53 matt Exp $");
 
 #include "opt_ddb.h"
 
@@ -61,6 +61,7 @@
 extern int trap_types;
 
 int    db_active = 0;
+db_regs_t ddb_regs;    /* register state */
 
 void kdbprinttrap __P((int, int));
 
diff -r d25a66386f4e -r 9fe543fa3162 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Sun May 12 23:15:42 2002 +0000
+++ b/sys/arch/i386/i386/machdep.c      Sun May 12 23:16:52 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.470 2002/03/20 15:59:27 joda Exp $       */
+/*     $NetBSD: machdep.c,v 1.471 2002/05/12 23:16:53 matt Exp $       */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.470 2002/03/20 15:59:27 joda Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.471 2002/05/12 23:16:53 matt Exp $");
 
 #include "opt_cputype.h"
 #include "opt_ddb.h"
@@ -179,6 +179,11 @@
 char machine[] = "i386";               /* cpu "architecture" */
 char machine_arch[] = "i386";          /* machine == machine_arch */
 
+volatile int cpl, ipending, astpending;
+int imask[NIPL];
+
+int want_resched;                      /* resched() was called */
+
 u_int cpu_serial[3];
 
 char bootinfo[BOOTINFO_MAXSIZE];
@@ -186,6 +191,8 @@
 /* Our exported CPU info; we have only one right now. */  
 struct cpu_info cpu_info_store;
 
+struct pcb *curpcb;                    /* our current running pcb */
+
 struct bi_devmatch *i386_alldisks = NULL;
 int i386_ndisks = 0;
 
@@ -203,7 +210,6 @@
 int    physmem;
 int    dumpmem_low;
 int    dumpmem_high;
-int    boothowto;
 int    cpu_class;
 int    i386_fpu_present;
 int    i386_fpu_exception;
diff -r d25a66386f4e -r 9fe543fa3162 sys/arch/i386/include/cpu.h
--- a/sys/arch/i386/include/cpu.h       Sun May 12 23:15:42 2002 +0000
+++ b/sys/arch/i386/include/cpu.h       Sun May 12 23:16:52 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.79 2002/05/08 18:45:49 mycroft Exp $ */
+/*     $NetBSD: cpu.h,v 1.80 2002/05/12 23:16:52 matt Exp $    */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -124,7 +124,7 @@
  * 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(ci)        (want_resched = 1, setsoftast())
 
 /*
diff -r d25a66386f4e -r 9fe543fa3162 sys/arch/i386/include/db_machdep.h
--- a/sys/arch/i386/include/db_machdep.h        Sun May 12 23:15:42 2002 +0000
+++ b/sys/arch/i386/include/db_machdep.h        Sun May 12 23:16:52 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_machdep.h,v 1.17 2001/06/17 21:01:37 sommerfeld Exp $       */
+/*     $NetBSD: db_machdep.h,v 1.18 2002/05/12 23:16:52 matt Exp $     */
 
 /* 
  * Mach Operating System
@@ -41,7 +41,7 @@
 typedef        long            db_expr_t;      /* expression - signed */
 
 typedef struct trapframe db_regs_t;
-db_regs_t      ddb_regs;       /* register state */
+extern db_regs_t ddb_regs;     /* register state */
 #define        DDB_REGS        (&ddb_regs)
 
 #if defined(lint)
diff -r d25a66386f4e -r 9fe543fa3162 sys/arch/i386/include/intr.h
--- a/sys/arch/i386/include/intr.h      Sun May 12 23:15:42 2002 +0000
+++ b/sys/arch/i386/include/intr.h      Sun May 12 23:16:52 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.24 2001/12/18 15:21:13 yamt Exp $   */
+/*     $NetBSD: intr.h,v 1.25 2002/05/12 23:16:52 matt Exp $   */
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -70,8 +70,8 @@
 
 #ifndef _LOCORE
 
-volatile int cpl, ipending, astpending;
-int imask[NIPL];
+extern volatile int cpl, ipending, astpending;
+extern int imask[NIPL];
 
 void Xspllower __P((void));
 
diff -r d25a66386f4e -r 9fe543fa3162 sys/arch/i386/include/pcb.h
--- a/sys/arch/i386/include/pcb.h       Sun May 12 23:15:42 2002 +0000
+++ b/sys/arch/i386/include/pcb.h       Sun May 12 23:16:52 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcb.h,v 1.30 2002/02/16 16:22:03 christos Exp $        */
+/*     $NetBSD: pcb.h,v 1.31 2002/05/12 23:16:52 matt Exp $    */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -122,7 +122,7 @@
 };    
 
 #ifdef _KERNEL
-struct pcb *curpcb;            /* our current running pcb */
+extern struct pcb *curpcb;             /* our current running pcb */
 #endif
 
 #endif /* _I386_PCB_H_ */