--- Net2/arch/i386/isa/icu.s 2018/04/24 18:07:13 1.1.1.2 +++ Net2/arch/i386/isa/icu.s 2018/04/24 18:12:09 1.1.1.3 @@ -43,6 +43,7 @@ */ .data + ALIGN32 .globl _imen .globl _cpl _cpl: .long 0xffff # current priority level (all off) @@ -56,12 +57,28 @@ _biomask: .long 0 .globl _netmask _netmask: .long 0 .globl _isa_intr + /* + * This is the names of the counters for vmstat added by + * rgrimes@agora.rain.com (Rodney W. Grimes) 10/30/1992 + * Added false and stray counters 3/25/1993 rgrimes + */ + .globl _intrcnt, _eintrcnt /* Added to make vmstat happy */ + .globl _isa_false7_intrcnt, _isa_false15_intrcnt, _isa_stray_intrcnt +_intrcnt: /* Added to make vmstat happy */ +_isa_false7_intrcnt: + .space 4 /* false IRQ7's */ +_isa_false15_intrcnt: + .space 4 /* false IRQ15's */ +_isa_stray_intrcnt: + .space 4 /* stray interrupts */ _isa_intr: .space 16*4 +_eintrcnt: /* Added to make vmstat happy */ .text /* * Handle return from interrupt after device handler finishes */ + ALIGN32 doreti: cli popl %ebx # remove intr number @@ -89,6 +106,7 @@ doreti: addl $8,%esp iret + ALIGN32 1: cmpl $0,_netisr # check for softint s/traps jne 1f cmpl $0,_want_resched @@ -102,6 +120,7 @@ doreti: #include "../net/netisr.h" + ALIGN32 1: #define DONET(s, c) ; \ @@ -171,6 +190,7 @@ doreti: .globl _splhigh .globl _splclock + ALIGN32 _splhigh: _splclock: cli # disable interrupts @@ -190,6 +210,7 @@ _splclock: ret .globl _spltty # block clists + ALIGN32 _spltty: cli # disable interrupts NOP @@ -210,6 +231,7 @@ _spltty: .globl _splimp .globl _splnet + ALIGN32 _splimp: _splnet: cli # disable interrupts @@ -230,6 +252,7 @@ _splnet: ret .globl _splbio + ALIGN32 _splbio: cli # disable interrupts NOP @@ -249,6 +272,7 @@ _splbio: ret .globl _splsoftclock + ALIGN32 _splsoftclock: cli # disable interrupts NOP @@ -269,6 +293,7 @@ _splsoftclock: .globl _splnone .globl _spl0 + ALIGN32 _splnone: _spl0: cli # disable interrupts @@ -307,6 +332,7 @@ _spl0: ret .globl _splx + ALIGN32 _splx: cli # disable interrupts NOP