From f389ad265574521be43d28600d914be7a66442d0 Mon Sep 17 00:00:00 2001 From: Erik van der Kouwe Date: Fri, 23 Jul 2010 07:12:47 +0000 Subject: [PATCH] Move sensitive instructions from libc into kernel --- kernel/arch/i386/Makefile.inc | 7 +++++++ {lib/libc/arch/i386/misc => kernel/arch/i386}/io_inb.S | 0 {lib/libc/arch/i386/misc => kernel/arch/i386}/io_inl.S | 0 {lib/libc/arch/i386/misc => kernel/arch/i386}/io_intr.S | 0 {lib/libc/arch/i386/misc => kernel/arch/i386}/io_inw.S | 0 {lib/libc/arch/i386/misc => kernel/arch/i386}/io_outb.S | 0 {lib/libc/arch/i386/misc => kernel/arch/i386}/io_outl.S | 0 {lib/libc/arch/i386/misc => kernel/arch/i386}/io_outw.S | 0 lib/libc/arch/i386/misc/Makefile.inc | 7 ------- 9 files changed, 7 insertions(+), 7 deletions(-) rename {lib/libc/arch/i386/misc => kernel/arch/i386}/io_inb.S (100%) rename {lib/libc/arch/i386/misc => kernel/arch/i386}/io_inl.S (100%) rename {lib/libc/arch/i386/misc => kernel/arch/i386}/io_intr.S (100%) rename {lib/libc/arch/i386/misc => kernel/arch/i386}/io_inw.S (100%) rename {lib/libc/arch/i386/misc => kernel/arch/i386}/io_outb.S (100%) rename {lib/libc/arch/i386/misc => kernel/arch/i386}/io_outl.S (100%) rename {lib/libc/arch/i386/misc => kernel/arch/i386}/io_outw.S (100%) diff --git a/kernel/arch/i386/Makefile.inc b/kernel/arch/i386/Makefile.inc index 620c3e879..f1ebb14ef 100644 --- 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 2c0a23a2e..3f6727748 100644 --- 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 -- 2.44.0