Browse code Merge branch 'master' of http://Git.BrainChurts.com:8080/git/MrOlsen/UbixOS.git Conflicts: sys/vmm/getfreevirtualpage.c sys/vmm/paging.c 1.0-RELEASE 1.5-RELEASE master RELEASE-1.5 RELEASE-1.24
commit 07a9ed31daf4337ecfe5629ccc7561a93da71997 2 parents 896c95f + 6d84420 Christopher W. Olsen authored on 19 Jan 2018

Showing 25 changed files

• bin/init/main.c
• bin/ls/main.c
• doc/vmm/i386_vmm_map.txt
• sys/i386/fork.c
• sys/i386/i386_exec.c
• sys/i386/sched.c
• sys/i386/trap.c
• sys/include/sys/trap.h
• sys/include/vmm/paging.h
• sys/include/vmm/vmm.h
• sys/init/main.c
• sys/kernel/elf.c
• sys/kernel/gen_calls.c
• sys/kernel/ld.c
• sys/vmm/Makefile
• sys/vmm/copyvirtualspace.c
• sys/vmm/createvirtualspace.c
• sys/vmm/getfreepage.c
• sys/vmm/getfreevirtualpage.c
• sys/vmm/pagefault.c
• sys/vmm/paging.c
• sys/vmm/unmappage.c
• sys/vmm/vmm_allocpagetable.c
• sys/vmm/vmm_init.c
• sys/vmm/vmm_mmap.c

Ignore Space Show notes View bin/init/main.c

Ignore Space Show notes View bin/ls/main.c

Ignore Space Show notes View doc/vmm/i386_vmm_map.txt

Ignore Space Show notes View sys/i386/fork.c

Ignore Space Show notes View sys/i386/i386_exec.c

Ignore Space Show notes View sys/i386/sched.c

Ignore Space Show notes View sys/i386/trap.c

Ignore Space Show notes View sys/include/sys/trap.h

Ignore Space Show notes View sys/include/vmm/paging.h

Ignore Space Show notes View sys/include/vmm/vmm.h

Ignore Space Show notes View sys/init/main.c

Ignore Space Show notes View sys/kernel/elf.c

Ignore Space Show notes View sys/kernel/gen_calls.c

Ignore Space Show notes View sys/kernel/ld.c

Ignore Space Show notes View sys/vmm/Makefile

Ignore Space Show notes View sys/vmm/copyvirtualspace.c

Ignore Space Show notes View sys/vmm/createvirtualspace.c

Ignore Space Show notes View sys/vmm/getfreepage.c

Ignore Space Show notes View sys/vmm/getfreevirtualpage.c

Ignore Space Show notes View sys/vmm/pagefault.c

Ignore Space Show notes View sys/vmm/paging.c

Ignore Space Show notes View sys/vmm/unmappage.c

Ignore Space Show notes View sys/vmm/vmm_allocpagetable.c 0 → 100644

Ignore Space Show notes View sys/vmm/vmm_init.c

Ignore Space Show notes View sys/vmm/vmm_mmap.c

Show line notes below