summaryrefslogtreecommitdiffstats
path: root/sys/i386/include/mptable.h
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1999-08-09 10:35:05 +0000
committerphk <phk@FreeBSD.org>1999-08-09 10:35:05 +0000
commitee871b6440719fbe58a0cb8e994ad543265f4e1a (patch)
tree5e644fe7bdaf6b601abb674aac52092ad3fd8b45 /sys/i386/include/mptable.h
parentf0f8bd1b55697613d6f80eb5c65838ecc4b246e6 (diff)
downloadFreeBSD-src-ee871b6440719fbe58a0cb8e994ad543265f4e1a.zip
FreeBSD-src-ee871b6440719fbe58a0cb8e994ad543265f4e1a.tar.gz
Merge the cons.c and cons.h to the best of my ability. alpha may or
may not compile, I can't test it.
Diffstat (limited to 'sys/i386/include/mptable.h')
-rw-r--r--sys/i386/include/mptable.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index e81efef..969cd08 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mp_machdep.c,v 1.105 1999/06/23 23:02:38 msmith Exp $
+ * $Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $
*/
#include "opt_smp.h"
@@ -45,6 +45,7 @@
#ifdef BETTER_CLOCK
#include <sys/dkstat.h>
#endif
+#include <sys/cons.h> /* cngetc() */
#include <vm/vm.h>
#include <vm/vm_param.h>
@@ -73,8 +74,6 @@
#include <machine/cputypes.h>
#include <machine/globaldata.h>
-#include <i386/i386/cons.h> /* cngetc() */
-
#if defined(APIC_IO)
#include <machine/md_var.h> /* setidt() */
#include <i386/isa/icu.h> /* IPIs */
OpenPOWER on IntegriCloud