Changeset c4fb95d3 in mainline

Timestamp:

2011-02-18T20:04:56Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d011038

Parents:

87e373b (diff), 8b1ea2d4 (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/Makefile.common (modified) (view diffs)
• contrib/arch/kernel/kernel.adl (modified) (view diffs)
• contrib/arch/uspace/lib/libc/protocol (modified) (view diffs)
• kernel/arch/arm32/src/mach/gta02/gta02.c (modified) (view diffs)
• kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (view diffs)
• kernel/arch/ia32/_link.ld.in (modified) (view diffs)
• kernel/arch/mips32/src/mm/tlb.c (modified) (view diffs)
• kernel/arch/sparc64/src/drivers/niagara.c (modified) (view diffs)
• kernel/generic/include/ddi/ddi.h (modified) (view diffs)
• kernel/generic/include/debug.h (modified) (view diffs)
• kernel/generic/include/ipc/event_types.h (modified) (view diffs)
• kernel/generic/include/ipc/ipc.h (modified) (view diffs)
• kernel/generic/include/ipc/sysipc.h (modified) (view diffs)
• kernel/generic/include/mm/as.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/syscall/syscall.h (modified) (view diffs)
• kernel/generic/include/sysinfo/abi.h (modified) (view diffs)
• kernel/generic/include/sysinfo/sysinfo.h (modified) (view diffs)
• kernel/generic/include/udebug/udebug.h (modified) (view diffs)
• kernel/generic/src/adt/avl.c (modified) (view diffs)
• kernel/generic/src/console/cmd.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/interrupt/interrupt.c (modified) (view diffs)
• kernel/generic/src/ipc/ipc.c (modified) (view diffs)
• kernel/generic/src/ipc/irq.c (modified) (view diffs)
• kernel/generic/src/ipc/sysipc.c (modified) (view diffs)
• kernel/generic/src/lib/elf.c (modified) (view diffs)
• kernel/generic/src/lib/rd.c (modified) (view diffs)
• kernel/generic/src/mm/as.c (modified) (view diffs)
• kernel/generic/src/mm/backend_phys.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/thread.c (modified) (view diffs)
• kernel/generic/src/synch/waitq.c (modified) (view diffs)
• kernel/generic/src/syscall/syscall.c (modified) (view diffs)
• kernel/generic/src/sysinfo/stats.c (modified) (view diffs)
• kernel/generic/src/sysinfo/sysinfo.c (modified) (view diffs)
• kernel/generic/src/time/clock.c (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/Makefile.common (modified) (view diffs)
• uspace/app/init/init.c (modified) (view diffs)
• uspace/app/klog/klog.c (modified) (view diffs)
• uspace/app/ping/ping.c (modified) (view diffs)
• uspace/app/stats/stats.c (modified) (view diffs)
• uspace/app/taskdump/taskdump.c (modified) (view diffs)
• uspace/app/tasks/Makefile (deleted)
• uspace/app/tasks/tasks.c (deleted)
• uspace/app/tester/hw/misc/virtchar1.c (modified) (view diffs)
• uspace/app/tester/hw/serial/serial1.c (modified) (view diffs)
• uspace/app/tester/tester.h (modified) (view diffs)
• uspace/app/tetris/screen.h (modified) (view diffs)
• uspace/app/top/screen.c (modified) (view diffs)
• uspace/app/top/top.c (modified) (view diffs)
• uspace/app/top/top.h (modified) (view diffs)
• uspace/app/trace/ipc_desc.c (modified) (view diffs)
• uspace/app/trace/ipcp.h (modified) (view diffs)
• uspace/app/trace/proto.c (modified) (view diffs)
• uspace/app/trace/proto.h (modified) (view diffs)
• uspace/app/trace/syscalls.c (modified) (view diffs)
• uspace/app/trace/trace.c (modified) (view diffs)
• uspace/drv/isa/isa.c (modified) (view diffs)
• uspace/drv/ns8250/ns8250.c (modified) (view diffs)
• uspace/drv/pciintel/pci.c (modified) (view diffs)
• uspace/drv/pciintel/pci.h (modified) (view diffs)
• uspace/drv/root/root.c (modified) (view diffs)
• uspace/drv/rootpc/rootpc.c (modified) (view diffs)
• uspace/drv/rootvirt/rootvirt.c (modified) (view diffs)
• uspace/drv/test1/char.c (modified) (view diffs)
• uspace/drv/test1/test1.c (modified) (view diffs)
• uspace/drv/test1/test1.h (modified) (view diffs)
• uspace/drv/test2/test2.c (modified) (view diffs)
• uspace/lib/block/libblock.c (modified) (view diffs)
• uspace/lib/c/Makefile (modified) (view diffs)
• uspace/lib/c/arch/abs32le/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/abs32le/src/entry.c (modified) (view diffs)
• uspace/lib/c/arch/abs32le/src/thread_entry.c (modified) (view diffs)
• uspace/lib/c/arch/amd64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/amd64/src/entry.s (modified) (view diffs)
• uspace/lib/c/arch/arm32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/arm32/src/entry.s (modified) (view diffs)
• uspace/lib/c/arch/ia32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/ia32/src/entry.s (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/mips32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/mips32/src/entry.s (modified) (view diffs)
• uspace/lib/c/arch/ppc32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/ppc32/src/entry.s (modified) (view diffs)
• uspace/lib/c/arch/sparc64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/sparc64/src/entry.s (modified) (view diffs)
• uspace/lib/c/generic/as.c (modified) (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/clipboard.c (modified) (view diffs)
• uspace/lib/c/generic/ddi.c (modified) (view diffs)
• uspace/lib/c/generic/devman.c (modified) (view diffs)
• uspace/lib/c/generic/devmap.c (modified) (view diffs)
• uspace/lib/c/generic/event.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/ipc.c (modified) (view diffs)
• uspace/lib/c/generic/ipc/ns.c (added)
• uspace/lib/c/generic/libc.c (modified) (view diffs)
• uspace/lib/c/generic/loader.c (modified) (view diffs)
• uspace/lib/c/generic/malloc.c (modified) (view diffs)
• uspace/lib/c/generic/net/icmp_api.c (modified) (view diffs)
• uspace/lib/c/generic/net/icmp_common.c (modified) (view diffs)
• uspace/lib/c/generic/net/modules.c (modified) (view diffs)
• uspace/lib/c/generic/net/socket_client.c (modified) (view diffs)
• uspace/lib/c/generic/private/async.h (moved) (moved from uspace/lib/c/include/async_priv.h ) (view diffs)
• uspace/lib/c/generic/private/async_sess.h (moved) (moved from uspace/lib/c/generic/err.c ) (view diffs)
• uspace/lib/c/generic/private/io.h (added)
• uspace/lib/c/generic/private/libc.h (added)
• uspace/lib/c/generic/private/malloc.h (added)
• uspace/lib/c/generic/private/thread.h (added)
• uspace/lib/c/generic/stats.c (modified) (view diffs)
• uspace/lib/c/generic/sysinfo.c (modified) (view diffs)
• uspace/lib/c/generic/thread.c (modified) (view diffs)
• uspace/lib/c/generic/time.c (modified) (view diffs)
• uspace/lib/c/generic/udebug.c (modified) (view diffs)
• uspace/lib/c/generic/vfs/vfs.c (modified) (view diffs)
• uspace/lib/c/include/adt/hash_table.h (modified) (view diffs)
• uspace/lib/c/include/as.h (modified) (view diffs)
• uspace/lib/c/include/async.h (modified) (view diffs)
• uspace/lib/c/include/async_sess.h (modified) (view diffs)
• uspace/lib/c/include/byteorder.h (modified) (view diffs)
• uspace/lib/c/include/ddi.h (modified) (view diffs)
• uspace/lib/c/include/devman.h (modified) (view diffs)
• uspace/lib/c/include/err.h (modified) (view diffs)
• uspace/lib/c/include/errno.h (modified) (view diffs)
• uspace/lib/c/include/event.h (modified) (view diffs)
• uspace/lib/c/include/io/console.h (modified) (view diffs)
• uspace/lib/c/include/io/screenbuffer.h (modified) (view diffs)
• uspace/lib/c/include/ipc/adb.h (modified) (view diffs)
• uspace/lib/c/include/ipc/arp.h (modified) (view diffs)
• uspace/lib/c/include/ipc/bd.h (modified) (view diffs)
• uspace/lib/c/include/ipc/char.h (modified) (view diffs)
• uspace/lib/c/include/ipc/clipboard.h (modified) (view diffs)
• uspace/lib/c/include/ipc/common.h (added)
• uspace/lib/c/include/ipc/console.h (modified) (view diffs)
• uspace/lib/c/include/ipc/dev_iface.h (modified) (view diffs)
• uspace/lib/c/include/ipc/devman.h (modified) (view diffs)
• uspace/lib/c/include/ipc/devmap.h (modified) (view diffs)
• uspace/lib/c/include/ipc/fb.h (modified) (view diffs)
• uspace/lib/c/include/ipc/icmp.h (modified) (view diffs)
• uspace/lib/c/include/ipc/il.h (modified) (view diffs)
• uspace/lib/c/include/ipc/ip.h (modified) (view diffs)
• uspace/lib/c/include/ipc/ipc.h (modified) (view diffs)
• uspace/lib/c/include/ipc/irc.h (modified) (view diffs)
• uspace/lib/c/include/ipc/kbd.h (modified) (view diffs)
• uspace/lib/c/include/ipc/loader.h (modified) (view diffs)
• uspace/lib/c/include/ipc/mouse.h (modified) (view diffs)
• uspace/lib/c/include/ipc/net.h (modified) (view diffs)
• uspace/lib/c/include/ipc/net_net.h (modified) (view diffs)
• uspace/lib/c/include/ipc/netif.h (modified) (view diffs)
• uspace/lib/c/include/ipc/nil.h (modified) (view diffs)
• uspace/lib/c/include/ipc/ns.h (modified) (view diffs)
• uspace/lib/c/include/ipc/packet.h (modified) (view diffs)
• uspace/lib/c/include/ipc/services.h (modified) (view diffs)
• uspace/lib/c/include/ipc/socket.h (modified) (view diffs)
• uspace/lib/c/include/ipc/tl.h (modified) (view diffs)
• uspace/lib/c/include/ipc/vfs.h (modified) (view diffs)
• uspace/lib/c/include/libc.h (modified) (view diffs)
• uspace/lib/c/include/loader/pcb.h (modified) (view diffs)
• uspace/lib/c/include/malloc.h (modified) (view diffs)
• uspace/lib/c/include/net/icmp_common.h (modified) (view diffs)
• uspace/lib/c/include/net/modules.h (modified) (view diffs)
• uspace/lib/c/include/setjmp.h (modified) (view diffs)
• uspace/lib/c/include/stdlib.h (modified) (view diffs)
• uspace/lib/c/include/syscall.h (modified) (view diffs)
• uspace/lib/c/include/thread.h (modified) (view diffs)
• uspace/lib/c/include/tls.h (modified) (view diffs)
• uspace/lib/c/include/udebug.h (modified) (view diffs)
• uspace/lib/c/include/unistd.h (modified) (view diffs)
• uspace/lib/c/include/vfs/vfs.h (modified) (view diffs)
• uspace/lib/clui/tinput.h (modified) (view diffs)
• uspace/lib/drv/generic/driver.c (modified) (view diffs)
• uspace/lib/drv/generic/remote_char_dev.c (modified) (view diffs)
• uspace/lib/drv/generic/remote_hw_res.c (modified) (view diffs)
• uspace/lib/drv/include/ddf/driver.h (moved) (moved from uspace/lib/drv/include/driver.h ) (view diffs)
• uspace/lib/drv/include/ddf/interrupt.h (added)
• uspace/lib/drv/include/dev_iface.h (modified) (view diffs)
• uspace/lib/drv/include/ops/char_dev.h (modified) (view diffs)
• uspace/lib/drv/include/ops/hw_res.h (modified) (view diffs)
• uspace/lib/fs/libfs.c (modified) (view diffs)
• uspace/lib/fs/libfs.h (modified) (view diffs)
• uspace/lib/net/generic/generic.c (modified) (view diffs)
• uspace/lib/net/generic/packet_remote.c (modified) (view diffs)
• uspace/lib/net/il/arp_remote.c (modified) (view diffs)
• uspace/lib/net/il/il_skel.c (modified) (view diffs)
• uspace/lib/net/include/generic.h (modified) (view diffs)
• uspace/lib/net/include/icmp_header.h (modified) (view diffs)
• uspace/lib/net/include/icmp_remote.h (moved) (moved from uspace/lib/net/include/icmp_interface.h ) (view diffs)
• uspace/lib/net/include/il_skel.h (modified) (view diffs)
• uspace/lib/net/include/netif_skel.h (modified) (view diffs)
• uspace/lib/net/include/nil_skel.h (modified) (view diffs)
• uspace/lib/net/include/tl_skel.h (modified) (view diffs)
• uspace/lib/net/netif/netif_skel.c (modified) (view diffs)
• uspace/lib/net/nil/nil_skel.c (modified) (view diffs)
• uspace/lib/net/tl/icmp_remote.c (modified) (view diffs)
• uspace/lib/net/tl/tl_common.c (modified) (view diffs)
• uspace/lib/net/tl/tl_skel.c (modified) (view diffs)
• uspace/lib/packet/generic/packet_server.c (modified) (view diffs)
• uspace/lib/packet/include/packet_server.h (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_bd.h (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_hw.h (modified) (view diffs)
• uspace/srv/bd/file_bd/file_bd.c (modified) (view diffs)
• uspace/srv/bd/gxe_bd/gxe_bd.c (modified) (view diffs)
• uspace/srv/bd/part/guid_part/guid_part.c (modified) (view diffs)
• uspace/srv/bd/part/mbr_part/mbr_part.c (modified) (view diffs)
• uspace/srv/bd/rd/rd.c (modified) (view diffs)
• uspace/srv/clip/clip.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/devman/match.c (modified) (view diffs)
• uspace/srv/devmap/devmap.c (modified) (view diffs)
• uspace/srv/fs/devfs/devfs.c (modified) (view diffs)
• uspace/srv/fs/devfs/devfs_ops.c (modified) (view diffs)
• uspace/srv/fs/devfs/devfs_ops.h (modified) (view diffs)
• uspace/srv/fs/fat/fat.c (modified) (view diffs)
• uspace/srv/fs/fat/fat.h (modified) (view diffs)
• uspace/srv/fs/fat/fat_ops.c (modified) (view diffs)
• uspace/srv/fs/tmpfs/tmpfs.c (modified) (view diffs)
• uspace/srv/fs/tmpfs/tmpfs.h (modified) (view diffs)
• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (view diffs)
• uspace/srv/hid/adb_mouse/adb_dev.c (modified) (view diffs)
• uspace/srv/hid/adb_mouse/adb_mouse.c (modified) (view diffs)
• uspace/srv/hid/char_mouse/char_mouse.c (modified) (view diffs)
• uspace/srv/hid/char_mouse/chardev.c (modified) (view diffs)
• uspace/srv/hid/console/console.c (modified) (view diffs)
• uspace/srv/hid/console/gcons.c (modified) (view diffs)
• uspace/srv/hid/fb/ega.c (modified) (view diffs)
• uspace/srv/hid/fb/fb.c (modified) (view diffs)
• uspace/srv/hid/fb/main.c (modified) (view diffs)
• uspace/srv/hid/fb/serial_console.c (modified) (view diffs)
• uspace/srv/hid/fb/serial_console.h (modified) (view diffs)
• uspace/srv/hid/kbd/generic/kbd.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/adb.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/chardev.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/gxemul.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/msim.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/ns16550.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/pl050.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/z8530.c (modified) (view diffs)
• uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• uspace/srv/hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
• uspace/srv/hw/char/i8042/i8042.c (modified) (view diffs)
• uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• uspace/srv/hw/irc/apic/apic.c (modified) (view diffs)
• uspace/srv/hw/irc/fhc/fhc.c (modified) (view diffs)
• uspace/srv/hw/irc/i8259/i8259.c (modified) (view diffs)
• uspace/srv/hw/irc/obio/obio.c (modified) (view diffs)
• uspace/srv/hw/netif/ne2000/ne2000.c (modified) (view diffs)
• uspace/srv/loader/arch/abs32le/_link.ld.in (modified) (view diffs)
• uspace/srv/loader/arch/amd64/_link.ld.in (modified) (view diffs)
• uspace/srv/loader/arch/arm32/_link.ld.in (modified) (view diffs)
• uspace/srv/loader/arch/ia32/_link.ld.in (modified) (view diffs)
• uspace/srv/loader/arch/ia64/_link.ld.in (modified) (view diffs)
• uspace/srv/loader/arch/mips32/_link.ld.in (modified) (view diffs)
• uspace/srv/loader/arch/ppc32/_link.ld.in (modified) (view diffs)
• uspace/srv/loader/arch/sparc64/_link.ld.in (modified) (view diffs)
• uspace/srv/loader/elf_load.c (modified) (view diffs)
• uspace/srv/loader/main.c (modified) (view diffs)
• uspace/srv/net/il/arp/arp.c (modified) (view diffs)
• uspace/srv/net/il/arp/arp.h (modified) (view diffs)
• uspace/srv/net/il/ip/ip.c (modified) (view diffs)
• uspace/srv/net/il/ip/ip.h (modified) (view diffs)
• uspace/srv/net/net/net.c (modified) (view diffs)
• uspace/srv/net/net/net.h (modified) (view diffs)
• uspace/srv/net/net/net_standalone.c (modified) (view diffs)
• uspace/srv/net/netif/lo/lo.c (modified) (view diffs)
• uspace/srv/net/nil/eth/eth.c (modified) (view diffs)
• uspace/srv/net/nil/nildummy/nildummy.c (modified) (view diffs)
• uspace/srv/net/tl/icmp/icmp.c (modified) (view diffs)
• uspace/srv/net/tl/icmp/icmp.h (deleted)
• uspace/srv/net/tl/tcp/tcp.c (modified) (view diffs)
• uspace/srv/net/tl/udp/udp.c (modified) (view diffs)
• uspace/srv/ns/clonable.c (modified) (view diffs)
• uspace/srv/ns/clonable.h (modified) (view diffs)
• uspace/srv/ns/ns.c (modified) (view diffs)
• uspace/srv/ns/service.c (modified) (view diffs)
• uspace/srv/ns/service.h (modified) (view diffs)
• uspace/srv/ns/task.c (modified) (view diffs)
• uspace/srv/ns/task.h (modified) (view diffs)
• uspace/srv/taskmon/taskmon.c (modified) (view diffs)
• uspace/srv/vfs/vfs.c (modified) (view diffs)
• uspace/srv/vfs/vfs.h (modified) (view diffs)
• uspace/srv/vfs/vfs_file.c (modified) (view diffs)
• uspace/srv/vfs/vfs_lookup.c (modified) (view diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (view diffs)
• uspace/srv/vfs/vfs_register.c (modified) (view diffs)