Merge remote branch 'origin/sparc-dev'
authorBarret Rhoden <brho@cs.berkeley.edu>
Thu, 3 Dec 2009 03:14:54 +0000 (19:14 -0800)
committerBarret Rhoden <brho@cs.berkeley.edu>
Thu, 3 Dec 2009 03:14:54 +0000 (19:14 -0800)
commitbb1b6942e6e246bc7d0ab2483d809d4bf9b20b2c
tree9d995aa15daeed5112d08178986cc54208ae5e89
parent977fb6b75d2b7ea394a9943ff77bfc3e61d71a9a
parent9246442b70fd48a37a21e88880ccf662293fc589
Merge remote branch 'origin/sparc-dev'

Still a few outstanding issues, like fully merging roslib into parlib
and sorting brk() and mmap().

Conflicts:
GNUmakefile
kern/arch/i386/atomic.h
kern/arch/sparc/trap.c
kern/include/env.h
kern/include/page_alloc.h
kern/include/ros/procdata.h
kern/src/env.c
kern/src/init.c
kern/src/kfs.c
kern/src/manager.c
kern/src/page_alloc.c
kern/src/syscall.c
user/apps/roslib/mhello.c
29 files changed:
GNUmakefile
kern/arch/i386/atomic.h
kern/arch/i386/pmap.c
kern/arch/i386/smp_boot.c
kern/arch/sparc/atomic.h
kern/arch/sparc/init.c
kern/arch/sparc/pmap.c
kern/arch/sparc/smp.c
kern/arch/sparc/trap.c
kern/include/env.h
kern/include/page_alloc.h
kern/include/process.h
kern/include/ros/procdata.h
kern/include/testing.h
kern/src/Makefrag
kern/src/env.c
kern/src/init.c
kern/src/kfs.c
kern/src/manager.c
kern/src/page_alloc.c
kern/src/pmap.c
kern/src/process.c
kern/src/slab.c
kern/src/syscall.c
kern/src/testing.c
user/apps/parlib/run_binary.c
user/apps/parlib/run_binary_colored.c
user/parlib/src/i386/entry.S
user/roslib/inc/lib.h