diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1997-04-20 06:41:26 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1997-04-20 06:41:26 +0000 |
| commit | a688c7b0ee28c28bb8ae755433477f705d88c67c (patch) | |
| tree | 8c7e3761a81ce7d46742d47d14b800a4423e7e06 /sys/amd64 | |
| parent | 1a256e98e885da18078ba36b46397670fa38cfb2 (diff) | |
| download | src-a688c7b0ee28c28bb8ae755433477f705d88c67c.tar.gz src-a688c7b0ee28c28bb8ae755433477f705d88c67c.zip | |
Fix up the "hlt vector" change I made.
Reviewed by: bde, bde, bde
Notes
Notes:
svn path=/head/; revision=25038
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/cpu_switch.S | 14 | ||||
| -rw-r--r-- | sys/amd64/amd64/swtch.s | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S index 30a5e48862cb..3898a53f6e1a 100644 --- a/sys/amd64/amd64/cpu_switch.S +++ b/sys/amd64/amd64/cpu_switch.S @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: swtch.s,v 1.44 1997/04/07 07:15:54 peter Exp $ + * $Id: swtch.s,v 1.45 1997/04/14 18:12:05 phk Exp $ */ #include "npx.h" @@ -66,6 +66,9 @@ _curpcb: .long 0 /* pointer to curproc's PCB area */ _whichqs: .long 0 /* which run queues have data */ _whichrtqs: .long 0 /* which realtime run queues have data */ _whichidqs: .long 0 /* which idletime run queues have data */ + .globl _hlt_vector +_hlt_vector: .long _default_halt /* pointer to halt routine */ + .globl _qs,_cnt,_panic @@ -275,15 +278,12 @@ idle_loop: call *_hlt_vector /* wait for interrupt */ jmp idle_loop -defaulthlt: +CROSSJUMPTARGET(_idle) + +ENTRY(default_halt) hlt ret - .globl _hlt_vector -_hlt_vector: .long defaulthlt - -CROSSJUMPTARGET(_idle) - /* * cpu_switch() */ diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s index 30a5e48862cb..3898a53f6e1a 100644 --- a/sys/amd64/amd64/swtch.s +++ b/sys/amd64/amd64/swtch.s @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: swtch.s,v 1.44 1997/04/07 07:15:54 peter Exp $ + * $Id: swtch.s,v 1.45 1997/04/14 18:12:05 phk Exp $ */ #include "npx.h" @@ -66,6 +66,9 @@ _curpcb: .long 0 /* pointer to curproc's PCB area */ _whichqs: .long 0 /* which run queues have data */ _whichrtqs: .long 0 /* which realtime run queues have data */ _whichidqs: .long 0 /* which idletime run queues have data */ + .globl _hlt_vector +_hlt_vector: .long _default_halt /* pointer to halt routine */ + .globl _qs,_cnt,_panic @@ -275,15 +278,12 @@ idle_loop: call *_hlt_vector /* wait for interrupt */ jmp idle_loop -defaulthlt: +CROSSJUMPTARGET(_idle) + +ENTRY(default_halt) hlt ret - .globl _hlt_vector -_hlt_vector: .long defaulthlt - -CROSSJUMPTARGET(_idle) - /* * cpu_switch() */ |