Changeset b678410 in mainline

Timestamp:

2011-04-27T20:01:13Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a6dffb8

Parents:

628d548 (diff), 933cadf (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/arch/ia64/_link.ld.in (modified) (view diffs)
• boot/arch/ia64/src/boot.S (modified) (view diffs)
• kernel/Makefile (modified) (view diffs)
• kernel/arch/abs32le/include/types.h (modified) (view diffs)
• kernel/arch/amd64/include/types.h (modified) (view diffs)
• kernel/arch/arm32/include/types.h (modified) (view diffs)
• kernel/arch/ia32/include/types.h (modified) (view diffs)
• kernel/arch/ia64/_link.ld.in (modified) (view diffs)
• kernel/arch/ia64/include/types.h (modified) (view diffs)
• kernel/arch/ia64/src/ivt.S (modified) (view diffs)
• kernel/arch/ia64/src/start.S (modified) (view diffs)
• kernel/arch/mips32/include/atomic.h (modified) (view diffs)
• kernel/arch/mips32/include/types.h (modified) (view diffs)
• kernel/arch/mips32/src/mm/frame.c (modified) (view diffs)
• kernel/arch/ppc32/include/types.h (modified) (view diffs)
• kernel/arch/sparc64/include/cpu.h (modified) (view diffs)
• kernel/arch/sparc64/include/sun4u/cpu.h (modified) (view diffs)
• kernel/arch/sparc64/include/types.h (modified) (view diffs)
• kernel/generic/include/ipc/ipc.h (modified) (view diffs)
• kernel/generic/include/macros.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/reserve.h (moved) (moved from kernel/arch/sparc64/include/mm/cache.h ) (view diffs)
• kernel/generic/include/str.h (modified) (view diffs)
• kernel/generic/src/ipc/sysipc.c (modified) (view diffs)
• kernel/generic/src/lib/str.c (modified) (view diffs)
• kernel/generic/src/main/main.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/backend_phys.c (modified) (view diffs)
• kernel/generic/src/mm/frame.c (modified) (view diffs)
• kernel/generic/src/mm/reserve.c (added)
• kernel/generic/src/proc/scheduler.c (modified) (view diffs)
• uspace/app/klog/klog.c (modified) (view diffs)
• uspace/app/stats/stats.c (modified) (view diffs)
• uspace/app/tester/Makefile (modified) (view diffs)
• uspace/app/tester/mm/malloc2.c (moved) (moved from kernel/generic/include/proc/tasklet.h ) (view diffs)
• uspace/app/tester/mm/malloc2.def (added)
• uspace/app/tester/tester.c (modified) (view diffs)
• uspace/app/tester/tester.h (modified) (view diffs)
• uspace/app/top/screen.c (modified) (view diffs)
• uspace/lib/block/libblock.c (modified) (view diffs)
• uspace/lib/c/Makefile (modified) (view diffs)
• uspace/lib/c/arch/ia32/include/config.h (modified) (view diffs)
• uspace/lib/c/arch/ia32/include/ddi.h (modified) (view diffs)
• uspace/lib/c/arch/ia32/include/faddr.h (modified) (view diffs)
• uspace/lib/c/arch/ia32/include/fibril.h (modified) (view diffs)
• uspace/lib/c/arch/ia32/src/stacktrace.c (modified) (view diffs)
• uspace/lib/c/arch/ia64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/ia64/src/entry.s (modified) (view diffs)
• uspace/lib/c/arch/ia64/src/thread_entry.s (modified) (view diffs)
• uspace/lib/c/arch/mips32/include/atomic.h (modified) (view diffs)
• uspace/lib/c/generic/assert.c (moved) (moved from kernel/generic/src/proc/tasklet.c ) (view diffs)
• uspace/lib/c/generic/async.c (modified) (view diffs)
• uspace/lib/c/generic/async_sess.c (modified) (view diffs)
• uspace/lib/c/generic/errno.c (modified) (view diffs)
• uspace/lib/c/generic/fibril_synch.c (modified) (view diffs)
• uspace/lib/c/generic/io/io.c (modified) (view diffs)
• uspace/lib/c/generic/malloc.c (modified) (view diffs)
• uspace/lib/c/generic/stacktrace.c (modified) (view diffs)
• uspace/lib/c/generic/str.c (modified) (view diffs)
• uspace/lib/c/generic/vfs/vfs.c (modified) (view diffs)
• uspace/lib/c/include/assert.h (modified) (view diffs)
• uspace/lib/c/include/async.h (modified) (view diffs)
• uspace/lib/c/include/errno.h (modified) (view diffs)
• uspace/lib/c/include/fibril_synch.h (modified) (view diffs)
• uspace/lib/c/include/macros.h (modified) (view diffs)
• uspace/lib/c/include/str.h (modified) (view diffs)
• uspace/lib/drv/generic/driver.c (modified) (view diffs)
• uspace/lib/net/generic/net_checksum.c (modified) (view diffs)
• uspace/lib/net/il/ip_client.c (modified) (view diffs)
• uspace/lib/net/include/ip_client.h (modified) (view diffs)
• uspace/lib/net/tl/socket_core.c (modified) (view diffs)
• uspace/srv/devman/devman.c (modified) (view diffs)
• uspace/srv/devman/devman.h (modified) (view diffs)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_fat.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_idx.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_ops.c (modified) (view diffs)
• uspace/srv/hw/irc/apic/apic.c (modified) (view diffs)
• uspace/srv/hw/netif/ne2000/dp8390.c (modified) (view diffs)
• uspace/srv/loader/arch/ia64/_link.ld.in (modified) (view diffs)
• uspace/srv/net/il/ip/ip.c (modified) (view diffs)
• uspace/srv/ns/clonable.c (modified) (view diffs)
• uspace/srv/ns/service.c (modified) (view diffs)
• uspace/srv/ns/task.c (modified) (view diffs)
• uspace/srv/vfs/vfs_file.c (modified) (view diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (view diffs)