diff options
| author | kato <kato@FreeBSD.org> | 2000-06-06 08:20:22 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 2000-06-06 08:20:22 +0000 |
| commit | fae7c57d965bde722be5a6392a222ae2c6d8e08c (patch) | |
| tree | 9db19602ac37d9afbfc74eda283d07c6ebabf3ac /sys/pc98 | |
| parent | 856f4b7d9be78bca170a9243670cfd4ba8429abf (diff) | |
| download | FreeBSD-src-fae7c57d965bde722be5a6392a222ae2c6d8e08c.zip FreeBSD-src-fae7c57d965bde722be5a6392a222ae2c6d8e08c.tar.gz | |
Merged from sys/i386/isa/{clock.c,npx.c} revisions 1.151 and 1.82,
respectively.
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/cbus/clock.c | 2 | ||||
| -rw-r--r-- | sys/pc98/cbus/pcrtc.c | 2 | ||||
| -rw-r--r-- | sys/pc98/pc98/clock.c | 2 | ||||
| -rw-r--r-- | sys/pc98/pc98/npx.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c index 820421b..5b7d27e 100644 --- a/sys/pc98/cbus/clock.c +++ b/sys/pc98/cbus/clock.c @@ -144,7 +144,7 @@ int clkintr_pending; int disable_rtc_set; /* disable resettodr() if != 0 */ volatile u_int idelayed; int statclock_disable; -u_int stat_imask = SWI_CLOCK_MASK; +u_int stat_imask = SWI_LOW_MASK; #ifndef TIMER_FREQ #ifdef PC98 #define TIMER_FREQ 2457600; diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c index 820421b..5b7d27e 100644 --- a/sys/pc98/cbus/pcrtc.c +++ b/sys/pc98/cbus/pcrtc.c @@ -144,7 +144,7 @@ int clkintr_pending; int disable_rtc_set; /* disable resettodr() if != 0 */ volatile u_int idelayed; int statclock_disable; -u_int stat_imask = SWI_CLOCK_MASK; +u_int stat_imask = SWI_LOW_MASK; #ifndef TIMER_FREQ #ifdef PC98 #define TIMER_FREQ 2457600; diff --git a/sys/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c index 820421b..5b7d27e 100644 --- a/sys/pc98/pc98/clock.c +++ b/sys/pc98/pc98/clock.c @@ -144,7 +144,7 @@ int clkintr_pending; int disable_rtc_set; /* disable resettodr() if != 0 */ volatile u_int idelayed; int statclock_disable; -u_int stat_imask = SWI_CLOCK_MASK; +u_int stat_imask = SWI_LOW_MASK; #ifndef TIMER_FREQ #ifdef PC98 #define TIMER_FREQ 2457600; diff --git a/sys/pc98/pc98/npx.c b/sys/pc98/pc98/npx.c index b676e11..af5dd97 100644 --- a/sys/pc98/pc98/npx.c +++ b/sys/pc98/pc98/npx.c @@ -143,7 +143,7 @@ SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint, "Floatingpoint instructions executed in hardware"); #ifndef SMP -static u_int npx0_imask = SWI_CLOCK_MASK; +static u_int npx0_imask = SWI_LOW_MASK; static struct gate_descriptor npx_idt_probeintr; static int npx_intrno; static volatile u_int npx_intrs_while_probing; |
