diff options
| author | wollman <wollman@FreeBSD.org> | 1993-11-07 17:41:36 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1993-11-07 17:41:36 +0000 |
| commit | c1b92d6bad47f8c2ca5bd5d68fdad201868e0126 (patch) | |
| tree | 1a47aed456583dc1f94b57848af6a7feb004a609 /sys/amd64 | |
| parent | facbbe496cbc7e1626f928df414d55b8c243d83e (diff) | |
| download | FreeBSD-src-c1b92d6bad47f8c2ca5bd5d68fdad201868e0126.zip FreeBSD-src-c1b92d6bad47f8c2ca5bd5d68fdad201868e0126.tar.gz | |
Made all header files idempotent and moved incorrect common data from
headers into a related source file. (This is the only change to locore.s).
Also fixed pg() to be properly declared and use stdargs.
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/db_interface.c | 4 | ||||
| -rw-r--r-- | sys/amd64/amd64/locore.S | 13 | ||||
| -rw-r--r-- | sys/amd64/amd64/locore.s | 13 |
3 files changed, 27 insertions, 3 deletions
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c index 74c09dc..fe36fc3 100644 --- a/sys/amd64/amd64/db_interface.c +++ b/sys/amd64/amd64/db_interface.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id$ + * $Id: db_interface.c,v 1.2 1993/10/16 14:14:55 rgrimes Exp $ */ /* @@ -41,6 +41,8 @@ #include <sys/systm.h> /* just for boothowto --eichin */ int db_active = 0; +db_regs_t ddb_regs; + /* * Received keyboard interrupt sequence. */ diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index 3781885..d808571 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.7 1993/10/13 07:11:11 rgrimes Exp $ + * $Id: locore.s,v 1.8 1993/10/15 10:34:19 rgrimes Exp $ */ @@ -164,10 +164,21 @@ _atdevphys: .long 0 /* location of device mapping ptes (phys) */ _IdlePTD: .long 0 _KPTphys: .long 0 + .globl _curpcb, _whichqs +_curpcb: .long 0 /* pointer to curproc's PCB area */ +_whichqs: .long 0 /* which run queues have data */ + .globl _cyloffset,_proc0paddr _cyloffset: .long 0 _proc0paddr: .long 0 + /* Stuff for network ASTs */ + .globl _softem,_netisr,_astpending,_want_resched +_softem: .long 0 /* WFJ only knows... */ +_netisr: .long 0 /* set with bits for which queue to service */ +_astpending: .long 0 /* tells us an AST needs to be taken */ +_want_resched: .long 0 /* we need to re-schedule */ + .space 512 tmpstk: diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s index 3781885..d808571 100644 --- a/sys/amd64/amd64/locore.s +++ b/sys/amd64/amd64/locore.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.7 1993/10/13 07:11:11 rgrimes Exp $ + * $Id: locore.s,v 1.8 1993/10/15 10:34:19 rgrimes Exp $ */ @@ -164,10 +164,21 @@ _atdevphys: .long 0 /* location of device mapping ptes (phys) */ _IdlePTD: .long 0 _KPTphys: .long 0 + .globl _curpcb, _whichqs +_curpcb: .long 0 /* pointer to curproc's PCB area */ +_whichqs: .long 0 /* which run queues have data */ + .globl _cyloffset,_proc0paddr _cyloffset: .long 0 _proc0paddr: .long 0 + /* Stuff for network ASTs */ + .globl _softem,_netisr,_astpending,_want_resched +_softem: .long 0 /* WFJ only knows... */ +_netisr: .long 0 /* set with bits for which queue to service */ +_astpending: .long 0 /* tells us an AST needs to be taken */ +_want_resched: .long 0 /* we need to re-schedule */ + .space 512 tmpstk: |
