Changeset df29f24 in mainline

Timestamp:

2011-06-01T09:04:08Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0a7627b, c9f0975

Parents:

e51a514 (diff), 5d1b3aa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Conflicts - trivial to solve
In kernel/generic/src/mm/page.c - sys_page_find_mapping does
not use locking when accessing page tables (hope that is correct).

Files:

• HelenOS.config (modified) (view diffs)
• boot/Makefile.common (modified) (view diffs)
• boot/arch/ppc32/src/asm.S (modified) (view diffs)
• contrib/conf/arm32-qe.sh (modified) (view diffs)
• contrib/conf/ia32-qe.sh (modified) (view diffs)
• contrib/conf/net-qe.bat (deleted)
• contrib/conf/ppc32-qe.sh (modified) (view diffs)
• defaults/ppc32/Makefile.config (modified) (view diffs)
• kernel/Makefile (modified) (view diffs)
• kernel/arch/abs32le/include/mm/as.h (modified) (view diffs)
• kernel/arch/amd64/include/mm/as.h (modified) (view diffs)
• kernel/arch/amd64/src/proc/scheduler.c (modified) (view diffs)
• kernel/arch/amd64/src/userspace.c (modified) (view diffs)
• kernel/arch/arm32/include/mm/as.h (modified) (view diffs)
• kernel/arch/arm32/src/arm32.c (modified) (view diffs)
• kernel/arch/arm32/src/userspace.c (modified) (view diffs)
• kernel/arch/ia32/include/mm/as.h (modified) (view diffs)
• kernel/arch/ia32/src/proc/scheduler.c (modified) (view diffs)
• kernel/arch/ia32/src/userspace.c (modified) (view diffs)
• kernel/arch/ia64/include/arch.h (modified) (view diffs)
• kernel/arch/ia64/include/asm.h (modified) (view diffs)
• kernel/arch/ia64/include/context.h (modified) (view diffs)
• kernel/arch/ia64/include/mm/as.h (modified) (view diffs)
• kernel/arch/ia64/include/mm/frame.h (modified) (view diffs)
• kernel/arch/ia64/include/register.h (modified) (view diffs)
• kernel/arch/ia64/src/ia64.c (modified) (view diffs)
• kernel/arch/ia64/src/ivt.S (modified) (view diffs)
• kernel/arch/ia64/src/mm/tlb.c (modified) (view diffs)
• kernel/arch/ia64/src/proc/scheduler.c (modified) (view diffs)
• kernel/arch/mips32/include/mm/as.h (modified) (view diffs)
• kernel/arch/mips32/src/debugger.c (modified) (view diffs)
• kernel/arch/mips32/src/mips32.c (modified) (view diffs)
• kernel/arch/mips32/src/mm/tlb.c (modified) (view diffs)
• kernel/arch/ppc32/Makefile.inc (modified) (view diffs)
• kernel/arch/ppc32/include/boot/boot.h (modified) (view diffs)
• kernel/arch/ppc32/include/interrupt.h (modified) (view diffs)
• kernel/arch/ppc32/include/istate.h (modified) (view diffs)
• kernel/arch/ppc32/include/mm/as.h (modified) (view diffs)
• kernel/arch/ppc32/include/mm/pht.h (moved) (moved from kernel/test/fpu/mips2_skip.c ) (view diffs)
• kernel/arch/ppc32/include/mm/tlb.h (modified) (view diffs)
• kernel/arch/ppc32/src/boot/boot.S (modified) (view diffs)
• kernel/arch/ppc32/src/exception.S (modified) (view diffs)
• kernel/arch/ppc32/src/interrupt.c (modified) (view diffs)
• kernel/arch/ppc32/src/mm/page.c (modified) (view diffs)
• kernel/arch/ppc32/src/mm/pht.c (added)
• kernel/arch/ppc32/src/mm/tlb.c (modified) (view diffs)
• kernel/arch/ppc32/src/ppc32.c (modified) (view diffs)
• kernel/arch/ppc32/src/proc/scheduler.c (modified) (view diffs)
• kernel/arch/sparc64/Makefile.inc (modified) (view diffs)
• kernel/arch/sparc64/include/mm/sun4u/as.h (modified) (view diffs)
• kernel/arch/sparc64/include/mm/sun4v/as.h (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4u/as.c (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4u/tlb.c (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4v/as.c (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4v/tlb.c (modified) (view diffs)
• kernel/genarch/include/mm/page_pt.h (modified) (view diffs)
• kernel/genarch/src/drivers/ega/ega.c (modified) (view diffs)
• kernel/genarch/src/mm/page_ht.c (modified) (view diffs)
• kernel/genarch/src/mm/page_pt.c (modified) (view diffs)
• kernel/generic/include/adt/list.h (modified) (view diffs)
• kernel/generic/include/arch.h (modified) (view diffs)
• kernel/generic/include/config.h (modified) (view diffs)
• kernel/generic/include/cpu.h (modified) (view diffs)
• kernel/generic/include/ipc/event.h (modified) (view diffs)
• kernel/generic/include/mm/as.h (modified) (view diffs)
• kernel/generic/include/mm/frame.h (modified) (view diffs)
• kernel/generic/include/mm/page.h (modified) (view diffs)
• kernel/generic/include/mm/tlb.h (modified) (view diffs)
• kernel/generic/include/proc/task.h (modified) (view diffs)
• kernel/generic/include/proc/thread.h (modified) (view diffs)
• kernel/generic/include/proc/uarg.h (modified) (view diffs)
• kernel/generic/include/synch/waitq.h (modified) (view diffs)
• kernel/generic/include/typedefs.h (modified) (view diffs)
• kernel/generic/src/adt/list.c (modified) (view diffs)
• kernel/generic/src/console/console.c (modified) (view diffs)
• kernel/generic/src/ddi/ddi.c (modified) (view diffs)
• kernel/generic/src/debug/panic.c (modified) (view diffs)
• kernel/generic/src/interrupt/interrupt.c (modified) (view diffs)
• kernel/generic/src/ipc/event.c (modified) (view diffs)
• kernel/generic/src/lib/elf.c (modified) (view diffs)
• kernel/generic/src/lib/memfnc.c (modified) (view diffs)
• kernel/generic/src/main/main.c (modified) (view diffs)
• kernel/generic/src/main/uinit.c (modified) (view diffs)
• kernel/generic/src/mm/as.c (modified) (view diffs)
• kernel/generic/src/mm/backend_anon.c (modified) (view diffs)
• kernel/generic/src/mm/backend_elf.c (modified) (view diffs)
• kernel/generic/src/mm/page.c (modified) (view diffs)
• kernel/generic/src/printf/vprintf.c (modified) (view diffs)
• kernel/generic/src/proc/program.c (modified) (view diffs)
• kernel/generic/src/proc/scheduler.c (modified) (view diffs)
• kernel/generic/src/proc/task.c (modified) (view diffs)
• kernel/generic/src/proc/the.c (modified) (view diffs)
• kernel/generic/src/proc/thread.c (modified) (view diffs)
• kernel/generic/src/security/cap.c (modified) (view diffs)
• kernel/generic/src/synch/futex.c (modified) (view diffs)
• kernel/generic/src/synch/spinlock.c (modified) (view diffs)
• kernel/test/fpu/fpu1.def (deleted)
• kernel/test/fpu/fpu1_ia64.c (deleted)
• kernel/test/fpu/fpu1_skip.c (deleted)
• kernel/test/fpu/fpu1_x86.c (deleted)
• kernel/test/fpu/mips2.c (deleted)
• kernel/test/fpu/mips2.def (deleted)
• kernel/test/fpu/sse1.c (deleted)
• kernel/test/fpu/sse1.def (deleted)
• kernel/test/mm/mapping1.c (modified) (view diffs)
• kernel/test/test.c (modified) (view diffs)
• kernel/test/test.h (modified) (view diffs)
• tools/toolchain.sh (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/app/tester/Makefile (modified) (view diffs)
• uspace/app/tester/devs/devman2.c (moved) (moved from kernel/test/fpu/sse1_skip.c ) (view diffs)
• uspace/app/tester/devs/devman2.def (added)
• uspace/app/tester/mm/common.c (added)
• uspace/app/tester/mm/common.h (added)
• uspace/app/tester/mm/malloc1.c (modified) (view diffs)
• uspace/app/tester/mm/malloc3.c (added)
• uspace/app/tester/mm/malloc3.def (added)
• uspace/app/tester/tester.c (modified) (view diffs)
• uspace/app/tester/tester.h (modified) (view diffs)
• uspace/drv/rootvirt/devices.def (modified) (view diffs)
• uspace/drv/test3/Makefile (added)
• uspace/drv/test3/test3.c (added)
• uspace/drv/test3/test3.ma (added)
• uspace/lib/c/arch/ppc32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/generic/assert.c (modified) (view diffs)
• uspace/lib/c/generic/io/klog.c (modified) (view diffs)
• uspace/lib/c/generic/io/vprintf.c (modified) (view diffs)
• uspace/lib/c/generic/malloc.c (modified) (view diffs)
• uspace/lib/c/generic/thread.c (modified) (view diffs)
• uspace/lib/c/include/adt/list.h (modified) (view diffs)
• uspace/lib/c/include/as.h (modified) (view diffs)
• uspace/lib/c/include/io/klog.h (modified) (view diffs)
• uspace/lib/c/include/malloc.h (modified) (view diffs)
• uspace/lib/net/il/ip_client.c (modified) (view diffs)
• uspace/lib/net/include/ip_header.h (modified) (view diffs)
• uspace/srv/net/il/ip/ip.c (modified) (view diffs)
• uspace/srv/net/tl/tcp/tcp.c (modified) (view diffs)
• uspace/srv/net/tl/tcp/tcp_header.h (modified) (view diffs)
• uspace/srv/vfs/vfs.h (modified) (view diffs)
• uspace/srv/vfs/vfs_file.c (modified) (view diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (view diffs)