Changeset b678410 in mainline for uspace

Timestamp:

2011-04-27T20:01:13Z (15 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.

Location:

uspace

Files:

• app/klog/klog.c (modified) (view diffs)
• app/stats/stats.c (modified) (view diffs)
• app/tester/Makefile (modified) (view diffs)
• app/tester/mm/malloc2.c (moved) (moved from kernel/generic/include/proc/tasklet.h ) (view diffs)
• app/tester/mm/malloc2.def (added)
• app/tester/tester.c (modified) (view diffs)
• app/tester/tester.h (modified) (view diffs)
• app/top/screen.c (modified) (view diffs)
• lib/block/libblock.c (modified) (view diffs)
• lib/c/Makefile (modified) (view diffs)
• lib/c/arch/ia32/include/config.h (modified) (view diffs)
• lib/c/arch/ia32/include/ddi.h (modified) (view diffs)
• lib/c/arch/ia32/include/faddr.h (modified) (view diffs)
• lib/c/arch/ia32/include/fibril.h (modified) (view diffs)
• lib/c/arch/ia32/src/stacktrace.c (modified) (view diffs)
• lib/c/arch/ia64/_link.ld.in (modified) (view diffs)
• lib/c/arch/ia64/src/entry.s (modified) (view diffs)
• lib/c/arch/ia64/src/thread_entry.s (modified) (view diffs)
• lib/c/arch/mips32/include/atomic.h (modified) (view diffs)
• lib/c/generic/assert.c (moved) (moved from kernel/generic/src/proc/tasklet.c ) (view diffs)
• lib/c/generic/async.c (modified) (view diffs)
• lib/c/generic/async_sess.c (modified) (view diffs)
• lib/c/generic/errno.c (modified) (view diffs)
• lib/c/generic/fibril_synch.c (modified) (view diffs)
• lib/c/generic/io/io.c (modified) (view diffs)
• lib/c/generic/malloc.c (modified) (view diffs)
• lib/c/generic/stacktrace.c (modified) (view diffs)
• lib/c/generic/str.c (modified) (view diffs)
• lib/c/generic/vfs/vfs.c (modified) (view diffs)
• lib/c/include/assert.h (modified) (view diffs)
• lib/c/include/async.h (modified) (view diffs)
• lib/c/include/errno.h (modified) (view diffs)
• lib/c/include/fibril_synch.h (modified) (view diffs)
• lib/c/include/macros.h (modified) (view diffs)
• lib/c/include/str.h (modified) (view diffs)
• lib/drv/generic/driver.c (modified) (view diffs)
• lib/net/generic/net_checksum.c (modified) (view diffs)
• lib/net/il/ip_client.c (modified) (view diffs)
• lib/net/include/ip_client.h (modified) (view diffs)
• lib/net/tl/socket_core.c (modified) (view diffs)
• srv/devman/devman.c (modified) (view diffs)
• srv/devman/devman.h (modified) (view diffs)
• srv/devman/main.c (modified) (view diffs)
• srv/fs/fat/fat_fat.c (modified) (view diffs)
• srv/fs/fat/fat_idx.c (modified) (view diffs)
• srv/fs/fat/fat_ops.c (modified) (view diffs)
• srv/hw/irc/apic/apic.c (modified) (view diffs)
• srv/hw/netif/ne2000/dp8390.c (modified) (view diffs)
• srv/loader/arch/ia64/_link.ld.in (modified) (view diffs)
• srv/net/il/ip/ip.c (modified) (view diffs)
• srv/ns/clonable.c (modified) (view diffs)
• srv/ns/service.c (modified) (view diffs)
• srv/ns/task.c (modified) (view diffs)
• srv/vfs/vfs_file.c (modified) (view diffs)
• srv/vfs/vfs_ops.c (modified) (view diffs)