Merge from sys/i386/isa/clock.c revision 1.145.
This commit is contained in:
parent
4fcaaf69e7
commit
acd0dd6ce1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=50869
@ -95,6 +95,11 @@
|
||||
|
||||
#include <i386/isa/intr_machdep.h>
|
||||
|
||||
#include "mca.h"
|
||||
#if NMCA > 0
|
||||
#include <i386/isa/mca_machdep.h>
|
||||
#endif
|
||||
|
||||
#ifdef SMP
|
||||
#define disable_intr() CLOCK_DISABLE_INTR()
|
||||
#define enable_intr() CLOCK_ENABLE_INTR()
|
||||
@ -283,6 +288,11 @@ clkintr(struct clockframe frame)
|
||||
}
|
||||
break;
|
||||
}
|
||||
#if NMCA > 0
|
||||
/* Reset clock interrupt by asserting bit 7 of port 0x61 */
|
||||
if (MCA_system)
|
||||
outb(0x61, inb(0x61) | 0x80);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -95,6 +95,11 @@
|
||||
|
||||
#include <i386/isa/intr_machdep.h>
|
||||
|
||||
#include "mca.h"
|
||||
#if NMCA > 0
|
||||
#include <i386/isa/mca_machdep.h>
|
||||
#endif
|
||||
|
||||
#ifdef SMP
|
||||
#define disable_intr() CLOCK_DISABLE_INTR()
|
||||
#define enable_intr() CLOCK_ENABLE_INTR()
|
||||
@ -283,6 +288,11 @@ clkintr(struct clockframe frame)
|
||||
}
|
||||
break;
|
||||
}
|
||||
#if NMCA > 0
|
||||
/* Reset clock interrupt by asserting bit 7 of port 0x61 */
|
||||
if (MCA_system)
|
||||
outb(0x61, inb(0x61) | 0x80);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -95,6 +95,11 @@
|
||||
|
||||
#include <i386/isa/intr_machdep.h>
|
||||
|
||||
#include "mca.h"
|
||||
#if NMCA > 0
|
||||
#include <i386/isa/mca_machdep.h>
|
||||
#endif
|
||||
|
||||
#ifdef SMP
|
||||
#define disable_intr() CLOCK_DISABLE_INTR()
|
||||
#define enable_intr() CLOCK_ENABLE_INTR()
|
||||
@ -283,6 +288,11 @@ clkintr(struct clockframe frame)
|
||||
}
|
||||
break;
|
||||
}
|
||||
#if NMCA > 0
|
||||
/* Reset clock interrupt by asserting bit 7 of port 0x61 */
|
||||
if (MCA_system)
|
||||
outb(0x61, inb(0x61) | 0x80);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user