diff --git a/.gitignore b/.gitignore index 811a7291a..46587e170 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ GSYMS GTAGS \#*# CVS -obj +# obj # Commented out to allow kernel object files to be tracked !/.gitignore .gitignore .svn @@ -40,6 +40,8 @@ etc/spwd.db releasetools/image releasetools/kernel releasetools/revision +# limine # Commented out to allow limine folder to be tracked +# microwindows share/zoneinfo/builddir external/bsd/llvm/dist/clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance-no-thu external/bsd/llvm/dist/clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance-pure-v diff --git a/limine b/limine new file mode 160000 index 000000000..e893b2973 --- /dev/null +++ b/limine @@ -0,0 +1 @@ +Subproject commit e893b297367dece22f9dc8f87e12ee1ecd380494 diff --git a/microwindows b/microwindows new file mode 160000 index 000000000..d1b097499 --- /dev/null +++ b/microwindows @@ -0,0 +1 @@ +Subproject commit d1b097499fca070c31bc09ac780db10e3fb5481d diff --git a/minix/kernel/arch/earm/arch_do_vmctl.c b/minix/kernel/arch/earm/arch_do_vmctl.c index dbee45088..8275d099f 100644 --- a/minix/kernel/arch/earm/arch_do_vmctl.c +++ b/minix/kernel/arch/earm/arch_do_vmctl.c @@ -8,7 +8,7 @@ */ #include "kernel/system.h" -// #include // Replaced +// #include // Replaced because kernel-specific assertion macros (e.g., KASSERT_PLACEHOLDER) are used instead for better integration with the kernel environment. #include // Kept for now, may need future review #include "arch_proto.h"