kernel: make sure mpx.S is linked early

	. for qemu multiboot detection

diff --git a/kernel/Makefile b/kernel/Makefile
index 8cc59213d1e7f905f20681f01e6db4bf0abfbf95..b85519743dfe2cbf6d82e68579b5a9e62e452269 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -3,7 +3,9 @@
 
 PROG=  kernel
 
-SRCS=  clock.c cpulocals.c interrupt.c main.c proc.c start.c system.c \
+.include "arch/${ARCH}/Makefile.inc"
+
+SRCS+= clock.c cpulocals.c interrupt.c main.c proc.c start.c system.c \
        table.c utility.c 
 
 DPADD+=        ${LIBTIMERS} ${LIBSYS} ${LIBEXEC}
@@ -29,7 +31,6 @@ BINDIR=       /usr/sbin
 MAN=
 
 .include "system/Makefile.inc"
-.include "arch/${ARCH}/Makefile.inc"
 
 .ifdef CONFIG_SMP
 SRCS+= smp.c

diff --git a/kernel/arch/i386/Makefile.inc b/kernel/arch/i386/Makefile.inc
index a53824aab855738e8fa2f5e74b2d7e1ae12e7dfd..53bbfb13fa708ea3250f54275e410cbdcc4b2118 100644 (file)
--- a/kernel/arch/i386/Makefile.inc
+++ b/kernel/arch/i386/Makefile.inc
@@ -4,9 +4,9 @@
 
 HERE=${.CURDIR}/arch/${ARCH}
 .PATH: ${HERE}
-SRCS+= arch_clock.c arch_do_vmctl.c arch_system.c \
+SRCS+= mpx.S arch_clock.c arch_do_vmctl.c arch_system.c \
        do_iopenable.c do_readbios.c do_sdevio.c exception.c i8259.c io_inb.S \
-       io_inl.S io_intr.S io_inw.S io_outb.S io_outl.S io_outw.S klib.S klib16.S memory.c mpx.S multiboot.S \
+       io_inl.S io_intr.S io_inw.S io_outb.S io_outl.S io_outw.S klib.S klib16.S memory.c multiboot.S \
        oxpcie.c pre_init.c protect.c
 
 .if ${USE_ACPI} != "no"