Changeset 3deb0155 in mainline

Timestamp:

2013-04-10T19:11:45Z (11 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

dd0c8a0

Parents:

44186b01 (diff), b4f43a1 (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

Files:

• boot/generic/include/memstr.h (modified) (view diffs)
• boot/generic/src/memstr.c (modified) (view diffs)
• defaults/amd64/Makefile.config (modified) (view diffs)
• defaults/arm32/Makefile.config (modified) (view diffs)
• defaults/arm32/beagleboardxm/Makefile.config (modified) (view diffs)
• defaults/arm32/beaglebone/Makefile.config (modified) (view diffs)
• defaults/arm32/gta02/Makefile.config (modified) (view diffs)
• defaults/ia32/Makefile.config (modified) (view diffs)
• defaults/ia64/Makefile.config (modified) (view diffs)
• defaults/mips32/Makefile.config (modified) (view diffs)
• defaults/mips64/Makefile.config (modified) (view diffs)
• defaults/ppc32/Makefile.config (modified) (view diffs)
• defaults/sparc64/Makefile.config (modified) (view diffs)
• defaults/special/Makefile.config (modified) (view diffs)
• kernel/arch/amd64/src/mm/page.c (modified) (view diffs)
• kernel/arch/arm32/src/fpu_context.c (modified) (view diffs)
• kernel/arch/ia32/src/mm/page.c (modified) (view diffs)
• kernel/arch/mips32/src/mm/tlb.c (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4u/tlb.c (modified) (view diffs)
• kernel/genarch/Makefile.inc (modified) (view diffs)
• kernel/genarch/src/fb/fb.c (modified) (view diffs)
• kernel/genarch/src/fb/logo-196x66.c (deleted)
• kernel/generic/include/lib/memfnc.h (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/backend_phys.c (modified) (view diffs)
• kernel/generic/src/mm/page.c (modified) (view diffs)
• kernel/generic/src/sysinfo/sysinfo.c (modified) (view diffs)
• tools/mkext2.py (modified) (view diffs)
• tools/toolchain.sh (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/ls/ls.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/sleep/sleep.c (modified) (view diffs)
• uspace/app/bnchmark/bnchmark.c (modified) (view diffs)
• uspace/app/trace/ipc_desc.c (modified) (view diffs)
• uspace/app/trace/ipc_desc.h (modified) (view diffs)
• uspace/app/trace/ipcp.c (modified) (view diffs)
• uspace/app/trace/syscalls.c (modified) (view diffs)
• uspace/app/trace/syscalls.h (modified) (view diffs)
• uspace/app/trace/trace.c (modified) (view diffs)
• uspace/app/vlaunch/Makefile (modified) (view diffs)
• uspace/app/vlaunch/gfx/helenos.tga (added)
• uspace/app/vlaunch/vlaunch.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhub/port.c (modified) (view diffs)
• uspace/lib/c/arch/ia32/src/setjmp.S (modified) (view diffs)
• uspace/lib/c/generic/adt/hash_table.c (modified) (view diffs)
• uspace/lib/c/generic/async.c (modified) (view diffs)
• uspace/lib/c/include/mem.h (modified) (view diffs)
• uspace/lib/c/include/setjmp.h (modified) (view diffs)
• uspace/lib/c/include/sys/types.h (modified) (view diffs)
• uspace/lib/gui/Makefile (modified) (view diffs)
• uspace/lib/gui/canvas.c (added)
• uspace/lib/gui/canvas.h (moved) (moved from kernel/genarch/include/genarch/fb/logo-196x66.h ) (view diffs)
• uspace/lib/posix/include/posix/fcntl.h (modified) (view diffs)
• uspace/lib/posix/include/posix/float.h (modified) (view diffs)
• uspace/lib/posix/include/posix/limits.h (modified) (view diffs)
• uspace/lib/posix/include/posix/math.h (modified) (view diffs)
• uspace/lib/posix/include/posix/stdio.h (modified) (view diffs)
• uspace/lib/posix/source/math.c (modified) (view diffs)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/fs/exfat/exfat_fat.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_dentry.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_dentry.h (modified) (view diffs)
• uspace/srv/fs/fat/fat_fat.c (modified) (view diffs)
• uspace/srv/fs/mfs/mfs_ops.c (modified) (view diffs)
• uspace/srv/hid/compositor/Makefile (modified) (view diffs)
• uspace/srv/hid/compositor/compositor.c (modified) (view diffs)
• uspace/srv/hid/compositor/gfx/helenos.tga (deleted)