[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/2] Umbennen von src/kernel2 zu src/kernel
Signed-off-by: Nico Mayer <mayerNico@xxxxxxxxxx>
---
buildmk.sh | 2 +-
src/{kernel2 => kernel}/.ignorenobuild | 0
src/{kernel2 => kernel}/include/apic.h | 0
src/{kernel2 => kernel}/include/arch/amd64/cpu_arch.h | 0
src/{kernel2 => kernel}/include/arch/amd64/mm_arch.h | 0
src/{kernel2 => kernel}/include/arch/i386/cpu_arch.h | 0
src/{kernel2 => kernel}/include/arch/i386/mm_arch.h | 0
src/{kernel2 => kernel}/include/console.h | 0
src/{kernel2 => kernel}/include/cpu.h | 0
src/{kernel2 => kernel}/include/debug.h | 0
src/{kernel2 => kernel}/include/gdt.h | 0
src/{kernel2 => kernel}/include/im.h | 0
src/{kernel2 => kernel}/include/kernel.h | 0
src/{kernel2 => kernel}/include/kprintf.h | 0
src/{kernel2 => kernel}/include/lostio/client.h | 0
src/{kernel2 => kernel}/include/lostio/core.h | 0
src/{kernel2 => kernel}/include/lostio/userspace.h | 0
src/{kernel2 => kernel}/include/mm.h | 0
src/{kernel2 => kernel}/include/multiboot.h | 0
src/{kernel2 => kernel}/include/notifier.h | 0
src/{kernel2 => kernel}/include/pic.h | 0
src/{kernel2 => kernel}/include/smp.h | 0
src/{kernel2 => kernel}/include/syscall.h | 0
src/{kernel2 => kernel}/include/tasks.h | 0
src/{kernel2 => kernel}/include/timer.h | 0
src/{kernel2 => kernel}/include/vm86.h | 0
src/{kernel2 => kernel}/src/arch/amd64/Makefile.all | 0
src/{kernel2 => kernel}/src/arch/amd64/cpu.c | 0
src/{kernel2 => kernel}/src/arch/amd64/debug.c | 0
src/{kernel2 => kernel}/src/arch/amd64/gdt.c | 0
src/{kernel2 => kernel}/src/arch/amd64/header.S | 0
src/{kernel2 => kernel}/src/arch/amd64/im/im.c | 0
src/{kernel2 => kernel}/src/arch/amd64/im/int_stubs.S | 0
src/{kernel2 => kernel}/src/arch/amd64/kernel.ld | 0
src/{kernel2 => kernel}/src/arch/amd64/loader/loader.c | 0
src/{kernel2 => kernel}/src/arch/amd64/loader/loader.ld | 0
src/{kernel2 => kernel}/src/arch/amd64/loader/startup.S | 0
src/{kernel2 => kernel}/src/arch/amd64/mm/mm_context.c | 0
src/{kernel2 => kernel}/src/arch/amd64/mm/mm_virt.c | 0
src/{kernel2 => kernel}/src/arch/amd64/smp/trampoline.S | 0
src/{kernel2 => kernel}/src/arch/i386/Makefile.all | 0
src/{kernel2 => kernel}/src/arch/i386/cpu.c | 0
src/{kernel2 => kernel}/src/arch/i386/debug.c | 0
src/{kernel2 => kernel}/src/arch/i386/gdt.c | 0
src/{kernel2 => kernel}/src/arch/i386/header.asm | 0
src/{kernel2 => kernel}/src/arch/i386/interrupts/im.c | 0
src/{kernel2 => kernel}/src/arch/i386/interrupts/int_stubs.S | 0
src/{kernel2 => kernel}/src/arch/i386/io.c | 0
src/{kernel2 => kernel}/src/arch/i386/kernel.ld | 0
src/{kernel2 => kernel}/src/arch/i386/mm/mm_context.c | 0
src/{kernel2 => kernel}/src/arch/i386/mm/virt.c | 0
src/{kernel2 => kernel}/src/arch/i386/smp/trampoline.S | 0
src/{kernel2 => kernel}/src/arch/i386/syscall.c | 0
src/{kernel2 => kernel}/src/arch/i386/syscalls/vm86.c | 0
src/{kernel2 => kernel}/src/arch/i386/vm86.c | 0
src/{kernel2 => kernel}/src/console.c | 0
src/{kernel2 => kernel}/src/debug.c | 0
src/{kernel2 => kernel}/src/init.c | 0
src/{kernel2 => kernel}/src/interrupts/apic.c | 0
src/{kernel2 => kernel}/src/interrupts/im.c | 0
src/{kernel2 => kernel}/src/interrupts/pic.c | 0
src/{kernel2 => kernel}/src/kprintf.c | 0
src/{kernel2 => kernel}/src/libc_helper.c | 0
src/{kernel2 => kernel}/src/lostio/client.c | 0
src/{kernel2 => kernel}/src/lostio/include/lostio_int.h | 0
src/{kernel2 => kernel}/src/lostio/lostio.c | 0
src/{kernel2 => kernel}/src/lostio/modules/file.c | 0
src/{kernel2 => kernel}/src/lostio/modules/tmp.c | 0
src/{kernel2 => kernel}/src/lostio/pipes.c | 0
src/{kernel2 => kernel}/src/lostio/tree.c | 0
src/{kernel2 => kernel}/src/lostio/userspace.c | 0
src/{kernel2 => kernel}/src/mm/phys.c | 0
src/{kernel2 => kernel}/src/mm/shm.c | 0
src/{kernel2 => kernel}/src/module.mk | 0
src/{kernel2 => kernel}/src/notifier.c | 0
src/{kernel2 => kernel}/src/smp/Makefile.conf | 0
src/{kernel2 => kernel}/src/smp/rm_trampoline.asm | 0
src/{kernel2 => kernel}/src/smp/smp.c | 0
src/{kernel2 => kernel}/src/syscall.c | 0
src/{kernel2 => kernel}/src/syscalls/io.c | 0
src/{kernel2 => kernel}/src/syscalls/lio_server.c | 0
src/{kernel2 => kernel}/src/syscalls/lostio.c | 0
src/{kernel2 => kernel}/src/syscalls/mem.c | 0
src/{kernel2 => kernel}/src/syscalls/misc.c | 0
src/{kernel2 => kernel}/src/syscalls/mutex.c | 0
src/{kernel2 => kernel}/src/syscalls/pm.c | 0
src/{kernel2 => kernel}/src/syscalls/pv.c | 0
src/{kernel2 => kernel}/src/syscalls/rpc.c | 0
src/{kernel2 => kernel}/src/syscalls/shm.c | 0
src/{kernel2 => kernel}/src/tasks/modules.c | 0
src/{kernel2 => kernel}/src/tasks/pm.c | 0
src/{kernel2 => kernel}/src/tasks/scheduler.c | 0
src/{kernel2 => kernel}/src/tasks/thread.c | 0
src/{kernel2 => kernel}/src/timer.c | 0
94 files changed, 1 insertion(+), 1 deletion(-)
rename src/{kernel2 => kernel}/.ignorenobuild (100%)
rename src/{kernel2 => kernel}/include/apic.h (100%)
rename src/{kernel2 => kernel}/include/arch/amd64/cpu_arch.h (100%)
rename src/{kernel2 => kernel}/include/arch/amd64/mm_arch.h (100%)
rename src/{kernel2 => kernel}/include/arch/i386/cpu_arch.h (100%)
rename src/{kernel2 => kernel}/include/arch/i386/mm_arch.h (100%)
rename src/{kernel2 => kernel}/include/console.h (100%)
rename src/{kernel2 => kernel}/include/cpu.h (100%)
rename src/{kernel2 => kernel}/include/debug.h (100%)
rename src/{kernel2 => kernel}/include/gdt.h (100%)
rename src/{kernel2 => kernel}/include/im.h (100%)
rename src/{kernel2 => kernel}/include/kernel.h (100%)
rename src/{kernel2 => kernel}/include/kprintf.h (100%)
rename src/{kernel2 => kernel}/include/lostio/client.h (100%)
rename src/{kernel2 => kernel}/include/lostio/core.h (100%)
rename src/{kernel2 => kernel}/include/lostio/userspace.h (100%)
rename src/{kernel2 => kernel}/include/mm.h (100%)
rename src/{kernel2 => kernel}/include/multiboot.h (100%)
rename src/{kernel2 => kernel}/include/notifier.h (100%)
rename src/{kernel2 => kernel}/include/pic.h (100%)
rename src/{kernel2 => kernel}/include/smp.h (100%)
rename src/{kernel2 => kernel}/include/syscall.h (100%)
rename src/{kernel2 => kernel}/include/tasks.h (100%)
rename src/{kernel2 => kernel}/include/timer.h (100%)
rename src/{kernel2 => kernel}/include/vm86.h (100%)
rename src/{kernel2 => kernel}/src/arch/amd64/Makefile.all (100%)
rename src/{kernel2 => kernel}/src/arch/amd64/cpu.c (100%)
rename src/{kernel2 => kernel}/src/arch/amd64/debug.c (100%)
rename src/{kernel2 => kernel}/src/arch/amd64/gdt.c (100%)
rename src/{kernel2 => kernel}/src/arch/amd64/header.S (100%)
rename src/{kernel2 => kernel}/src/arch/amd64/im/im.c (100%)
rename src/{kernel2 => kernel}/src/arch/amd64/im/int_stubs.S (100%)
rename src/{kernel2 => kernel}/src/arch/amd64/kernel.ld (100%)
rename src/{kernel2 => kernel}/src/arch/amd64/loader/loader.c (100%)
rename src/{kernel2 => kernel}/src/arch/amd64/loader/loader.ld (100%)
rename src/{kernel2 => kernel}/src/arch/amd64/loader/startup.S (100%)
rename src/{kernel2 => kernel}/src/arch/amd64/mm/mm_context.c (100%)
rename src/{kernel2 => kernel}/src/arch/amd64/mm/mm_virt.c (100%)
rename src/{kernel2 => kernel}/src/arch/amd64/smp/trampoline.S (100%)
rename src/{kernel2 => kernel}/src/arch/i386/Makefile.all (100%)
rename src/{kernel2 => kernel}/src/arch/i386/cpu.c (100%)
rename src/{kernel2 => kernel}/src/arch/i386/debug.c (100%)
rename src/{kernel2 => kernel}/src/arch/i386/gdt.c (100%)
rename src/{kernel2 => kernel}/src/arch/i386/header.asm (100%)
rename src/{kernel2 => kernel}/src/arch/i386/interrupts/im.c (100%)
rename src/{kernel2 => kernel}/src/arch/i386/interrupts/int_stubs.S (100%)
rename src/{kernel2 => kernel}/src/arch/i386/io.c (100%)
rename src/{kernel2 => kernel}/src/arch/i386/kernel.ld (100%)
rename src/{kernel2 => kernel}/src/arch/i386/mm/mm_context.c (100%)
rename src/{kernel2 => kernel}/src/arch/i386/mm/virt.c (100%)
rename src/{kernel2 => kernel}/src/arch/i386/smp/trampoline.S (100%)
rename src/{kernel2 => kernel}/src/arch/i386/syscall.c (100%)
rename src/{kernel2 => kernel}/src/arch/i386/syscalls/vm86.c (100%)
rename src/{kernel2 => kernel}/src/arch/i386/vm86.c (100%)
rename src/{kernel2 => kernel}/src/console.c (100%)
rename src/{kernel2 => kernel}/src/debug.c (100%)
rename src/{kernel2 => kernel}/src/init.c (100%)
rename src/{kernel2 => kernel}/src/interrupts/apic.c (100%)
rename src/{kernel2 => kernel}/src/interrupts/im.c (100%)
rename src/{kernel2 => kernel}/src/interrupts/pic.c (100%)
rename src/{kernel2 => kernel}/src/kprintf.c (100%)
rename src/{kernel2 => kernel}/src/libc_helper.c (100%)
rename src/{kernel2 => kernel}/src/lostio/client.c (100%)
rename src/{kernel2 => kernel}/src/lostio/include/lostio_int.h (100%)
rename src/{kernel2 => kernel}/src/lostio/lostio.c (100%)
rename src/{kernel2 => kernel}/src/lostio/modules/file.c (100%)
rename src/{kernel2 => kernel}/src/lostio/modules/tmp.c (100%)
rename src/{kernel2 => kernel}/src/lostio/pipes.c (100%)
rename src/{kernel2 => kernel}/src/lostio/tree.c (100%)
rename src/{kernel2 => kernel}/src/lostio/userspace.c (100%)
rename src/{kernel2 => kernel}/src/mm/phys.c (100%)
rename src/{kernel2 => kernel}/src/mm/shm.c (100%)
rename src/{kernel2 => kernel}/src/module.mk (100%)
rename src/{kernel2 => kernel}/src/notifier.c (100%)
rename src/{kernel2 => kernel}/src/smp/Makefile.conf (100%)
rename src/{kernel2 => kernel}/src/smp/rm_trampoline.asm (100%)
rename src/{kernel2 => kernel}/src/smp/smp.c (100%)
rename src/{kernel2 => kernel}/src/syscall.c (100%)
rename src/{kernel2 => kernel}/src/syscalls/io.c (100%)
rename src/{kernel2 => kernel}/src/syscalls/lio_server.c (100%)
rename src/{kernel2 => kernel}/src/syscalls/lostio.c (100%)
rename src/{kernel2 => kernel}/src/syscalls/mem.c (100%)
rename src/{kernel2 => kernel}/src/syscalls/misc.c (100%)
rename src/{kernel2 => kernel}/src/syscalls/mutex.c (100%)
rename src/{kernel2 => kernel}/src/syscalls/pm.c (100%)
rename src/{kernel2 => kernel}/src/syscalls/pv.c (100%)
rename src/{kernel2 => kernel}/src/syscalls/rpc.c (100%)
rename src/{kernel2 => kernel}/src/syscalls/shm.c (100%)
rename src/{kernel2 => kernel}/src/tasks/modules.c (100%)
rename src/{kernel2 => kernel}/src/tasks/pm.c (100%)
rename src/{kernel2 => kernel}/src/tasks/scheduler.c (100%)
rename src/{kernel2 => kernel}/src/tasks/thread.c (100%)
rename src/{kernel2 => kernel}/src/timer.c (100%)
diff --git a/buildmk.sh b/buildmk.sh
index ccd7d021..e5e61f90 100644
--- a/buildmk.sh
+++ b/buildmk.sh
@@ -134,7 +134,7 @@ AS=\$(AS_BINARY)
all:
EOF
-if [ "`pwd | grep '/src/kernel2'`" == "" ]; then
+if [ "`pwd | grep '/src/kernel'`" == "" ]; then
cat <<EOF >> Makefile
\$(MAKE) --no-print-directory -s makefiles
\$(MAKE) --no-print-directory -s subdirs
diff --git a/src/kernel2/.ignorenobuild b/src/kernel/.ignorenobuild
similarity index 100%
rename from src/kernel2/.ignorenobuild
rename to src/kernel/.ignorenobuild
diff --git a/src/kernel2/include/apic.h b/src/kernel/include/apic.h
similarity index 100%
rename from src/kernel2/include/apic.h
rename to src/kernel/include/apic.h
diff --git a/src/kernel2/include/arch/amd64/cpu_arch.h b/src/kernel/include/arch/amd64/cpu_arch.h
similarity index 100%
rename from src/kernel2/include/arch/amd64/cpu_arch.h
rename to src/kernel/include/arch/amd64/cpu_arch.h
diff --git a/src/kernel2/include/arch/amd64/mm_arch.h b/src/kernel/include/arch/amd64/mm_arch.h
similarity index 100%
rename from src/kernel2/include/arch/amd64/mm_arch.h
rename to src/kernel/include/arch/amd64/mm_arch.h
diff --git a/src/kernel2/include/arch/i386/cpu_arch.h b/src/kernel/include/arch/i386/cpu_arch.h
similarity index 100%
rename from src/kernel2/include/arch/i386/cpu_arch.h
rename to src/kernel/include/arch/i386/cpu_arch.h
diff --git a/src/kernel2/include/arch/i386/mm_arch.h b/src/kernel/include/arch/i386/mm_arch.h
similarity index 100%
rename from src/kernel2/include/arch/i386/mm_arch.h
rename to src/kernel/include/arch/i386/mm_arch.h
diff --git a/src/kernel2/include/console.h b/src/kernel/include/console.h
similarity index 100%
rename from src/kernel2/include/console.h
rename to src/kernel/include/console.h
diff --git a/src/kernel2/include/cpu.h b/src/kernel/include/cpu.h
similarity index 100%
rename from src/kernel2/include/cpu.h
rename to src/kernel/include/cpu.h
diff --git a/src/kernel2/include/debug.h b/src/kernel/include/debug.h
similarity index 100%
rename from src/kernel2/include/debug.h
rename to src/kernel/include/debug.h
diff --git a/src/kernel2/include/gdt.h b/src/kernel/include/gdt.h
similarity index 100%
rename from src/kernel2/include/gdt.h
rename to src/kernel/include/gdt.h
diff --git a/src/kernel2/include/im.h b/src/kernel/include/im.h
similarity index 100%
rename from src/kernel2/include/im.h
rename to src/kernel/include/im.h
diff --git a/src/kernel2/include/kernel.h b/src/kernel/include/kernel.h
similarity index 100%
rename from src/kernel2/include/kernel.h
rename to src/kernel/include/kernel.h
diff --git a/src/kernel2/include/kprintf.h b/src/kernel/include/kprintf.h
similarity index 100%
rename from src/kernel2/include/kprintf.h
rename to src/kernel/include/kprintf.h
diff --git a/src/kernel2/include/lostio/client.h b/src/kernel/include/lostio/client.h
similarity index 100%
rename from src/kernel2/include/lostio/client.h
rename to src/kernel/include/lostio/client.h
diff --git a/src/kernel2/include/lostio/core.h b/src/kernel/include/lostio/core.h
similarity index 100%
rename from src/kernel2/include/lostio/core.h
rename to src/kernel/include/lostio/core.h
diff --git a/src/kernel2/include/lostio/userspace.h b/src/kernel/include/lostio/userspace.h
similarity index 100%
rename from src/kernel2/include/lostio/userspace.h
rename to src/kernel/include/lostio/userspace.h
diff --git a/src/kernel2/include/mm.h b/src/kernel/include/mm.h
similarity index 100%
rename from src/kernel2/include/mm.h
rename to src/kernel/include/mm.h
diff --git a/src/kernel2/include/multiboot.h b/src/kernel/include/multiboot.h
similarity index 100%
rename from src/kernel2/include/multiboot.h
rename to src/kernel/include/multiboot.h
diff --git a/src/kernel2/include/notifier.h b/src/kernel/include/notifier.h
similarity index 100%
rename from src/kernel2/include/notifier.h
rename to src/kernel/include/notifier.h
diff --git a/src/kernel2/include/pic.h b/src/kernel/include/pic.h
similarity index 100%
rename from src/kernel2/include/pic.h
rename to src/kernel/include/pic.h
diff --git a/src/kernel2/include/smp.h b/src/kernel/include/smp.h
similarity index 100%
rename from src/kernel2/include/smp.h
rename to src/kernel/include/smp.h
diff --git a/src/kernel2/include/syscall.h b/src/kernel/include/syscall.h
similarity index 100%
rename from src/kernel2/include/syscall.h
rename to src/kernel/include/syscall.h
diff --git a/src/kernel2/include/tasks.h b/src/kernel/include/tasks.h
similarity index 100%
rename from src/kernel2/include/tasks.h
rename to src/kernel/include/tasks.h
diff --git a/src/kernel2/include/timer.h b/src/kernel/include/timer.h
similarity index 100%
rename from src/kernel2/include/timer.h
rename to src/kernel/include/timer.h
diff --git a/src/kernel2/include/vm86.h b/src/kernel/include/vm86.h
similarity index 100%
rename from src/kernel2/include/vm86.h
rename to src/kernel/include/vm86.h
diff --git a/src/kernel2/src/arch/amd64/Makefile.all b/src/kernel/src/arch/amd64/Makefile.all
similarity index 100%
rename from src/kernel2/src/arch/amd64/Makefile.all
rename to src/kernel/src/arch/amd64/Makefile.all
diff --git a/src/kernel2/src/arch/amd64/cpu.c b/src/kernel/src/arch/amd64/cpu.c
similarity index 100%
rename from src/kernel2/src/arch/amd64/cpu.c
rename to src/kernel/src/arch/amd64/cpu.c
diff --git a/src/kernel2/src/arch/amd64/debug.c b/src/kernel/src/arch/amd64/debug.c
similarity index 100%
rename from src/kernel2/src/arch/amd64/debug.c
rename to src/kernel/src/arch/amd64/debug.c
diff --git a/src/kernel2/src/arch/amd64/gdt.c b/src/kernel/src/arch/amd64/gdt.c
similarity index 100%
rename from src/kernel2/src/arch/amd64/gdt.c
rename to src/kernel/src/arch/amd64/gdt.c
diff --git a/src/kernel2/src/arch/amd64/header.S b/src/kernel/src/arch/amd64/header.S
similarity index 100%
rename from src/kernel2/src/arch/amd64/header.S
rename to src/kernel/src/arch/amd64/header.S
diff --git a/src/kernel2/src/arch/amd64/im/im.c b/src/kernel/src/arch/amd64/im/im.c
similarity index 100%
rename from src/kernel2/src/arch/amd64/im/im.c
rename to src/kernel/src/arch/amd64/im/im.c
diff --git a/src/kernel2/src/arch/amd64/im/int_stubs.S b/src/kernel/src/arch/amd64/im/int_stubs.S
similarity index 100%
rename from src/kernel2/src/arch/amd64/im/int_stubs.S
rename to src/kernel/src/arch/amd64/im/int_stubs.S
diff --git a/src/kernel2/src/arch/amd64/kernel.ld b/src/kernel/src/arch/amd64/kernel.ld
similarity index 100%
rename from src/kernel2/src/arch/amd64/kernel.ld
rename to src/kernel/src/arch/amd64/kernel.ld
diff --git a/src/kernel2/src/arch/amd64/loader/loader.c b/src/kernel/src/arch/amd64/loader/loader.c
similarity index 100%
rename from src/kernel2/src/arch/amd64/loader/loader.c
rename to src/kernel/src/arch/amd64/loader/loader.c
diff --git a/src/kernel2/src/arch/amd64/loader/loader.ld b/src/kernel/src/arch/amd64/loader/loader.ld
similarity index 100%
rename from src/kernel2/src/arch/amd64/loader/loader.ld
rename to src/kernel/src/arch/amd64/loader/loader.ld
diff --git a/src/kernel2/src/arch/amd64/loader/startup.S b/src/kernel/src/arch/amd64/loader/startup.S
similarity index 100%
rename from src/kernel2/src/arch/amd64/loader/startup.S
rename to src/kernel/src/arch/amd64/loader/startup.S
diff --git a/src/kernel2/src/arch/amd64/mm/mm_context.c b/src/kernel/src/arch/amd64/mm/mm_context.c
similarity index 100%
rename from src/kernel2/src/arch/amd64/mm/mm_context.c
rename to src/kernel/src/arch/amd64/mm/mm_context.c
diff --git a/src/kernel2/src/arch/amd64/mm/mm_virt.c b/src/kernel/src/arch/amd64/mm/mm_virt.c
similarity index 100%
rename from src/kernel2/src/arch/amd64/mm/mm_virt.c
rename to src/kernel/src/arch/amd64/mm/mm_virt.c
diff --git a/src/kernel2/src/arch/amd64/smp/trampoline.S b/src/kernel/src/arch/amd64/smp/trampoline.S
similarity index 100%
rename from src/kernel2/src/arch/amd64/smp/trampoline.S
rename to src/kernel/src/arch/amd64/smp/trampoline.S
diff --git a/src/kernel2/src/arch/i386/Makefile.all b/src/kernel/src/arch/i386/Makefile.all
similarity index 100%
rename from src/kernel2/src/arch/i386/Makefile.all
rename to src/kernel/src/arch/i386/Makefile.all
diff --git a/src/kernel2/src/arch/i386/cpu.c b/src/kernel/src/arch/i386/cpu.c
similarity index 100%
rename from src/kernel2/src/arch/i386/cpu.c
rename to src/kernel/src/arch/i386/cpu.c
diff --git a/src/kernel2/src/arch/i386/debug.c b/src/kernel/src/arch/i386/debug.c
similarity index 100%
rename from src/kernel2/src/arch/i386/debug.c
rename to src/kernel/src/arch/i386/debug.c
diff --git a/src/kernel2/src/arch/i386/gdt.c b/src/kernel/src/arch/i386/gdt.c
similarity index 100%
rename from src/kernel2/src/arch/i386/gdt.c
rename to src/kernel/src/arch/i386/gdt.c
diff --git a/src/kernel2/src/arch/i386/header.asm b/src/kernel/src/arch/i386/header.asm
similarity index 100%
rename from src/kernel2/src/arch/i386/header.asm
rename to src/kernel/src/arch/i386/header.asm
diff --git a/src/kernel2/src/arch/i386/interrupts/im.c b/src/kernel/src/arch/i386/interrupts/im.c
similarity index 100%
rename from src/kernel2/src/arch/i386/interrupts/im.c
rename to src/kernel/src/arch/i386/interrupts/im.c
diff --git a/src/kernel2/src/arch/i386/interrupts/int_stubs.S b/src/kernel/src/arch/i386/interrupts/int_stubs.S
similarity index 100%
rename from src/kernel2/src/arch/i386/interrupts/int_stubs.S
rename to src/kernel/src/arch/i386/interrupts/int_stubs.S
diff --git a/src/kernel2/src/arch/i386/io.c b/src/kernel/src/arch/i386/io.c
similarity index 100%
rename from src/kernel2/src/arch/i386/io.c
rename to src/kernel/src/arch/i386/io.c
diff --git a/src/kernel2/src/arch/i386/kernel.ld b/src/kernel/src/arch/i386/kernel.ld
similarity index 100%
rename from src/kernel2/src/arch/i386/kernel.ld
rename to src/kernel/src/arch/i386/kernel.ld
diff --git a/src/kernel2/src/arch/i386/mm/mm_context.c b/src/kernel/src/arch/i386/mm/mm_context.c
similarity index 100%
rename from src/kernel2/src/arch/i386/mm/mm_context.c
rename to src/kernel/src/arch/i386/mm/mm_context.c
diff --git a/src/kernel2/src/arch/i386/mm/virt.c b/src/kernel/src/arch/i386/mm/virt.c
similarity index 100%
rename from src/kernel2/src/arch/i386/mm/virt.c
rename to src/kernel/src/arch/i386/mm/virt.c
diff --git a/src/kernel2/src/arch/i386/smp/trampoline.S b/src/kernel/src/arch/i386/smp/trampoline.S
similarity index 100%
rename from src/kernel2/src/arch/i386/smp/trampoline.S
rename to src/kernel/src/arch/i386/smp/trampoline.S
diff --git a/src/kernel2/src/arch/i386/syscall.c b/src/kernel/src/arch/i386/syscall.c
similarity index 100%
rename from src/kernel2/src/arch/i386/syscall.c
rename to src/kernel/src/arch/i386/syscall.c
diff --git a/src/kernel2/src/arch/i386/syscalls/vm86.c b/src/kernel/src/arch/i386/syscalls/vm86.c
similarity index 100%
rename from src/kernel2/src/arch/i386/syscalls/vm86.c
rename to src/kernel/src/arch/i386/syscalls/vm86.c
diff --git a/src/kernel2/src/arch/i386/vm86.c b/src/kernel/src/arch/i386/vm86.c
similarity index 100%
rename from src/kernel2/src/arch/i386/vm86.c
rename to src/kernel/src/arch/i386/vm86.c
diff --git a/src/kernel2/src/console.c b/src/kernel/src/console.c
similarity index 100%
rename from src/kernel2/src/console.c
rename to src/kernel/src/console.c
diff --git a/src/kernel2/src/debug.c b/src/kernel/src/debug.c
similarity index 100%
rename from src/kernel2/src/debug.c
rename to src/kernel/src/debug.c
diff --git a/src/kernel2/src/init.c b/src/kernel/src/init.c
similarity index 100%
rename from src/kernel2/src/init.c
rename to src/kernel/src/init.c
diff --git a/src/kernel2/src/interrupts/apic.c b/src/kernel/src/interrupts/apic.c
similarity index 100%
rename from src/kernel2/src/interrupts/apic.c
rename to src/kernel/src/interrupts/apic.c
diff --git a/src/kernel2/src/interrupts/im.c b/src/kernel/src/interrupts/im.c
similarity index 100%
rename from src/kernel2/src/interrupts/im.c
rename to src/kernel/src/interrupts/im.c
diff --git a/src/kernel2/src/interrupts/pic.c b/src/kernel/src/interrupts/pic.c
similarity index 100%
rename from src/kernel2/src/interrupts/pic.c
rename to src/kernel/src/interrupts/pic.c
diff --git a/src/kernel2/src/kprintf.c b/src/kernel/src/kprintf.c
similarity index 100%
rename from src/kernel2/src/kprintf.c
rename to src/kernel/src/kprintf.c
diff --git a/src/kernel2/src/libc_helper.c b/src/kernel/src/libc_helper.c
similarity index 100%
rename from src/kernel2/src/libc_helper.c
rename to src/kernel/src/libc_helper.c
diff --git a/src/kernel2/src/lostio/client.c b/src/kernel/src/lostio/client.c
similarity index 100%
rename from src/kernel2/src/lostio/client.c
rename to src/kernel/src/lostio/client.c
diff --git a/src/kernel2/src/lostio/include/lostio_int.h b/src/kernel/src/lostio/include/lostio_int.h
similarity index 100%
rename from src/kernel2/src/lostio/include/lostio_int.h
rename to src/kernel/src/lostio/include/lostio_int.h
diff --git a/src/kernel2/src/lostio/lostio.c b/src/kernel/src/lostio/lostio.c
similarity index 100%
rename from src/kernel2/src/lostio/lostio.c
rename to src/kernel/src/lostio/lostio.c
diff --git a/src/kernel2/src/lostio/modules/file.c b/src/kernel/src/lostio/modules/file.c
similarity index 100%
rename from src/kernel2/src/lostio/modules/file.c
rename to src/kernel/src/lostio/modules/file.c
diff --git a/src/kernel2/src/lostio/modules/tmp.c b/src/kernel/src/lostio/modules/tmp.c
similarity index 100%
rename from src/kernel2/src/lostio/modules/tmp.c
rename to src/kernel/src/lostio/modules/tmp.c
diff --git a/src/kernel2/src/lostio/pipes.c b/src/kernel/src/lostio/pipes.c
similarity index 100%
rename from src/kernel2/src/lostio/pipes.c
rename to src/kernel/src/lostio/pipes.c
diff --git a/src/kernel2/src/lostio/tree.c b/src/kernel/src/lostio/tree.c
similarity index 100%
rename from src/kernel2/src/lostio/tree.c
rename to src/kernel/src/lostio/tree.c
diff --git a/src/kernel2/src/lostio/userspace.c b/src/kernel/src/lostio/userspace.c
similarity index 100%
rename from src/kernel2/src/lostio/userspace.c
rename to src/kernel/src/lostio/userspace.c
diff --git a/src/kernel2/src/mm/phys.c b/src/kernel/src/mm/phys.c
similarity index 100%
rename from src/kernel2/src/mm/phys.c
rename to src/kernel/src/mm/phys.c
diff --git a/src/kernel2/src/mm/shm.c b/src/kernel/src/mm/shm.c
similarity index 100%
rename from src/kernel2/src/mm/shm.c
rename to src/kernel/src/mm/shm.c
diff --git a/src/kernel2/src/module.mk b/src/kernel/src/module.mk
similarity index 100%
rename from src/kernel2/src/module.mk
rename to src/kernel/src/module.mk
diff --git a/src/kernel2/src/notifier.c b/src/kernel/src/notifier.c
similarity index 100%
rename from src/kernel2/src/notifier.c
rename to src/kernel/src/notifier.c
diff --git a/src/kernel2/src/smp/Makefile.conf b/src/kernel/src/smp/Makefile.conf
similarity index 100%
rename from src/kernel2/src/smp/Makefile.conf
rename to src/kernel/src/smp/Makefile.conf
diff --git a/src/kernel2/src/smp/rm_trampoline.asm b/src/kernel/src/smp/rm_trampoline.asm
similarity index 100%
rename from src/kernel2/src/smp/rm_trampoline.asm
rename to src/kernel/src/smp/rm_trampoline.asm
diff --git a/src/kernel2/src/smp/smp.c b/src/kernel/src/smp/smp.c
similarity index 100%
rename from src/kernel2/src/smp/smp.c
rename to src/kernel/src/smp/smp.c
diff --git a/src/kernel2/src/syscall.c b/src/kernel/src/syscall.c
similarity index 100%
rename from src/kernel2/src/syscall.c
rename to src/kernel/src/syscall.c
diff --git a/src/kernel2/src/syscalls/io.c b/src/kernel/src/syscalls/io.c
similarity index 100%
rename from src/kernel2/src/syscalls/io.c
rename to src/kernel/src/syscalls/io.c
diff --git a/src/kernel2/src/syscalls/lio_server.c b/src/kernel/src/syscalls/lio_server.c
similarity index 100%
rename from src/kernel2/src/syscalls/lio_server.c
rename to src/kernel/src/syscalls/lio_server.c
diff --git a/src/kernel2/src/syscalls/lostio.c b/src/kernel/src/syscalls/lostio.c
similarity index 100%
rename from src/kernel2/src/syscalls/lostio.c
rename to src/kernel/src/syscalls/lostio.c
diff --git a/src/kernel2/src/syscalls/mem.c b/src/kernel/src/syscalls/mem.c
similarity index 100%
rename from src/kernel2/src/syscalls/mem.c
rename to src/kernel/src/syscalls/mem.c
diff --git a/src/kernel2/src/syscalls/misc.c b/src/kernel/src/syscalls/misc.c
similarity index 100%
rename from src/kernel2/src/syscalls/misc.c
rename to src/kernel/src/syscalls/misc.c
diff --git a/src/kernel2/src/syscalls/mutex.c b/src/kernel/src/syscalls/mutex.c
similarity index 100%
rename from src/kernel2/src/syscalls/mutex.c
rename to src/kernel/src/syscalls/mutex.c
diff --git a/src/kernel2/src/syscalls/pm.c b/src/kernel/src/syscalls/pm.c
similarity index 100%
rename from src/kernel2/src/syscalls/pm.c
rename to src/kernel/src/syscalls/pm.c
diff --git a/src/kernel2/src/syscalls/pv.c b/src/kernel/src/syscalls/pv.c
similarity index 100%
rename from src/kernel2/src/syscalls/pv.c
rename to src/kernel/src/syscalls/pv.c
diff --git a/src/kernel2/src/syscalls/rpc.c b/src/kernel/src/syscalls/rpc.c
similarity index 100%
rename from src/kernel2/src/syscalls/rpc.c
rename to src/kernel/src/syscalls/rpc.c
diff --git a/src/kernel2/src/syscalls/shm.c b/src/kernel/src/syscalls/shm.c
similarity index 100%
rename from src/kernel2/src/syscalls/shm.c
rename to src/kernel/src/syscalls/shm.c
diff --git a/src/kernel2/src/tasks/modules.c b/src/kernel/src/tasks/modules.c
similarity index 100%
rename from src/kernel2/src/tasks/modules.c
rename to src/kernel/src/tasks/modules.c
diff --git a/src/kernel2/src/tasks/pm.c b/src/kernel/src/tasks/pm.c
similarity index 100%
rename from src/kernel2/src/tasks/pm.c
rename to src/kernel/src/tasks/pm.c
diff --git a/src/kernel2/src/tasks/scheduler.c b/src/kernel/src/tasks/scheduler.c
similarity index 100%
rename from src/kernel2/src/tasks/scheduler.c
rename to src/kernel/src/tasks/scheduler.c
diff --git a/src/kernel2/src/tasks/thread.c b/src/kernel/src/tasks/thread.c
similarity index 100%
rename from src/kernel2/src/tasks/thread.c
rename to src/kernel/src/tasks/thread.c
diff --git a/src/kernel2/src/timer.c b/src/kernel/src/timer.c
similarity index 100%
rename from src/kernel2/src/timer.c
rename to src/kernel/src/timer.c
--
2.24.1