Merge branch 'master' into net-dev (with code changes listed below besides normal...
authorPaul Pearce <pearce@eecs.berkeley.edu>
Fri, 28 Aug 2009 03:18:57 +0000 (20:18 -0700)
committerPaul Pearce <pearce@eecs.berkeley.edu>
Fri, 28 Aug 2009 03:18:57 +0000 (20:18 -0700)
commite592fbec5bf9e7149370ef3d0e196b5160547311
treeb74eb0849492c1ab145bd7082f1bcdb2aa202167
parentec9498e6a09abe0bec4b3d281c72c9caa38ea5ab
parentca557b67e837cf930f672ce5537b1b7660f1dc58
Merge branch 'master' into net-dev (with code changes listed below besides normal conflict resolution)

1) Kept several kmalloc changes that need to get worked back into the master. This is page_incref and size == 0 check
2) Reworked run_binary syscall to work with the new env/proc method. Now drops into kernel instead of back to matrix (need to fix)
3) Reordered things in kfs.c to match the Makefrag (measurements out of order). Also added draw_nanwan_standalone back into kern/src/Makefrag
4) Fixed some mptable odds and ends regarding entry counts of 0 and a left over variable from a previous commit.
5) Disabled deputy in kern/src/syscall.c. Several net-dev-only syscalls use unannoated structures from the driver, which will be going away with lwip

Conflicts:
kern/arch/i386/trap.c
kern/include/kmalloc.h
kern/include/ros/syscall.h
kern/include/string.h
kern/src/Makefrag
kern/src/env.c
kern/src/init.c
kern/src/kmalloc.c
kern/src/smp.c
kern/src/syscall.c
kern/src/testing.c
user/parlib/inc/parlib.h
24 files changed:
.gitignore
kern/arch/i386/apic.c
kern/arch/i386/apic.h
kern/arch/i386/smp_boot.c
kern/arch/i386/trap.c
kern/include/kfs.h
kern/include/ros/syscall.h
kern/include/testing.h
kern/src/Makefrag
kern/src/init.c
kern/src/kfs.c
kern/src/kmalloc.c
kern/src/manager.c
kern/src/monitor.c
kern/src/mptables.c
kern/src/ne2k.c
kern/src/syscall.c
kern/src/testing.c
user/apps/parlib/Makefrag
user/apps/parlib/file_io.c
user/apps/parlib/matrix.c
user/parlib/inc/parlib.h
user/parlib/src/i386/newlib_backend.c
user/parlib/src/syscall.c