Move sensitive instructions from libc into kernel

diff --git a/kernel/arch/i386/Makefile.inc b/kernel/arch/i386/Makefile.inc
index 620c3e879f997b77f5c2ba853f198b02216a2a46..f1ebb14ef2d389948f2844329d037896e99578bf 100644 (file)
--- a/kernel/arch/i386/Makefile.inc
+++ b/kernel/arch/i386/Makefile.inc
@@ -12,6 +12,13 @@ SRCS+=       arch_do_vmctl.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 \
        memory.c \
        oxpcie.c \

diff --git a/lib/libc/arch/i386/misc/io_inb.S b/kernel/arch/i386/io_inb.S
similarity index 100%
rename from lib/libc/arch/i386/misc/io_inb.S
rename to kernel/arch/i386/io_inb.S

diff --git a/lib/libc/arch/i386/misc/io_inl.S b/kernel/arch/i386/io_inl.S
similarity index 100%
rename from lib/libc/arch/i386/misc/io_inl.S
rename to kernel/arch/i386/io_inl.S

diff --git a/lib/libc/arch/i386/misc/io_intr.S b/kernel/arch/i386/io_intr.S
similarity index 100%
rename from lib/libc/arch/i386/misc/io_intr.S
rename to kernel/arch/i386/io_intr.S

diff --git a/lib/libc/arch/i386/misc/io_inw.S b/kernel/arch/i386/io_inw.S
similarity index 100%
rename from lib/libc/arch/i386/misc/io_inw.S
rename to kernel/arch/i386/io_inw.S

diff --git a/lib/libc/arch/i386/misc/io_outb.S b/kernel/arch/i386/io_outb.S
similarity index 100%
rename from lib/libc/arch/i386/misc/io_outb.S
rename to kernel/arch/i386/io_outb.S

diff --git a/lib/libc/arch/i386/misc/io_outl.S b/kernel/arch/i386/io_outl.S
similarity index 100%
rename from lib/libc/arch/i386/misc/io_outl.S
rename to kernel/arch/i386/io_outl.S

diff --git a/lib/libc/arch/i386/misc/io_outw.S b/kernel/arch/i386/io_outw.S
similarity index 100%
rename from lib/libc/arch/i386/misc/io_outw.S
rename to kernel/arch/i386/io_outw.S

diff --git a/lib/libc/arch/i386/misc/Makefile.inc b/lib/libc/arch/i386/misc/Makefile.inc
index 2c0a23a2e958c5dc3594fc132d78d423feba9b5f..3f6727748e561c0ce4a0f762e200d44bdcac24e1 100644 (file)
--- a/lib/libc/arch/i386/misc/Makefile.inc
+++ b/lib/libc/arch/i386/misc/Makefile.inc
@@ -7,13 +7,6 @@ SRCS+=  \
        alloca.S \
        get_bp.S \
        getprocessor.S \
-       io_inb.S \
-       io_inl.S \
-       io_intr.S \
-       io_inw.S \
-       io_outb.S \
-       io_outl.S \
-       io_outw.S \
        oneC_sum.S \
        ucontext.S