Browse code Merge branch 'master' of http://Git.BrainChurts.com:8080/git/MrOlsen/UbixOS.git Conflicts: sys/i386/systemtask.c sys/kernel/access.c sys/kernel/kern_sysctl.c sys/vmm/getfreevirtualpage.c master
commit d6a2ee45f1358dd8418cda58f483cf90d0f6b59d 2 parents 2a16330 + 92a3bb7 Christopher W. Olsen authored on 12 Jan 2018

Showing 18 changed files

• sys/fs/ufs/ufs.c
• sys/fs/vfs/file.c
• sys/fs/vfs/namei.c
• sys/fs/vfs/stat.c
• sys/fs/vfs/vfs.c
• sys/i386/systemtask.c
• sys/include/sys/sysproto.h
• sys/include/ubixos/sched.h
• sys/include/ubixos/wait.h
• sys/include/ufs/ufs.h
• sys/include/vfs/file.h
• sys/include/vfs/inode.h
• sys/include/vfs/vfs.h
• sys/kernel/access.c
• sys/kernel/kern_sysctl.c
• sys/kernel/syscalls.c
• sys/vmm/getfreevirtualpage.c
• sys/vmm/vmm_mmap.c

Ignore Space Show notes View sys/fs/ufs/ufs.c

Ignore Space Show notes View sys/fs/vfs/file.c

Ignore Space Show notes View sys/fs/vfs/namei.c

Ignore Space Show notes View sys/fs/vfs/stat.c

Ignore Space Show notes View sys/fs/vfs/vfs.c

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

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

Ignore Space Show notes View sys/include/ubixos/sched.h

Ignore Space Show notes View sys/include/ubixos/wait.h

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

Ignore Space Show notes View sys/include/vfs/file.h

Ignore Space Show notes View sys/include/vfs/inode.h 0 → 100644

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

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

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

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

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

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

Show line notes below