Changeset 87b52c9 in mainline

Timestamp:

2011-04-01T11:34:41Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

66a54cc

Parents:

df3ad97 (diff), 27bdfa5 (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 from usb/development

Files:

• HelenOS.config (modified) (view diffs)
• defaults/arm32/gta02/Makefile.config (modified) (view diffs)
• kernel/Makefile (modified) (view diffs)
• kernel/arch/abs32le/include/memstr.h (deleted)
• kernel/arch/amd64/Makefile.inc (modified) (view diffs)
• kernel/arch/amd64/_link.ld.in (modified) (view diffs)
• kernel/arch/amd64/src/asm.S (modified) (view diffs)
• kernel/arch/arm32/include/memstr.h (deleted)
• kernel/arch/arm32/src/asm.S (modified) (view diffs)
• kernel/arch/arm32/src/exception.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/ia32/include/memstr.h (deleted)
• kernel/arch/ia32/src/asm.S (modified) (view diffs)
• kernel/arch/ia32/src/cpu/cpu.c (modified) (view diffs)
• kernel/arch/ia64/_link.ld.in (modified) (view diffs)
• kernel/arch/ia64/src/asm.S (modified) (view diffs)
• kernel/arch/ia64/src/mm/tlb.c (modified) (view diffs)
• kernel/arch/mips32/include/cp0.h (modified) (view diffs)
• kernel/arch/mips32/include/memstr.h (deleted)
• kernel/arch/mips32/src/asm.S (modified) (view diffs)
• kernel/arch/ppc32/_link.ld.in (modified) (view diffs)
• kernel/arch/ppc32/include/memstr.h (deleted)
• kernel/arch/ppc32/src/asm.S (modified) (view diffs)
• kernel/arch/sparc64/_link.ld.in (modified) (view diffs)
• kernel/arch/sparc64/include/memstr.h (deleted)
• kernel/arch/sparc64/src/asm.S (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4u/as.c (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4v/as.c (modified) (view diffs)
• kernel/arch/sparc64/src/smp/sun4v/smp.c (modified) (view diffs)
• kernel/arch/sparc64/src/sun4v/start.S (modified) (view diffs)
• kernel/arch/sparc64/src/trap/sun4v/interrupt.c (modified) (view diffs)
• kernel/genarch/Makefile.inc (modified) (view diffs)
• kernel/genarch/src/drivers/via-cuda/cuda.c (modified) (view diffs)
• kernel/genarch/src/kbrd/kbrd_pl050.c (deleted)
• kernel/genarch/src/kbrd/scanc_pl050.c (deleted)
• kernel/genarch/src/ofw/ebus.c (modified) (view diffs)
• kernel/genarch/src/ofw/fhc.c (modified) (view diffs)
• kernel/genarch/src/ofw/ofw_tree.c (modified) (view diffs)
• kernel/genarch/src/ofw/pci.c (modified) (view diffs)
• kernel/genarch/src/ofw/upa.c (modified) (view diffs)
• kernel/generic/include/lib/memfnc.h (moved) (moved from kernel/arch/ia64/include/memstr.h ) (view diffs)
• kernel/generic/include/memstr.h (modified) (view diffs)
• kernel/generic/src/lib/memfnc.c (moved) (moved from kernel/arch/amd64/include/memstr.h ) (view diffs)
• kernel/generic/src/lib/memstr.c (modified) (view diffs)
• kernel/generic/src/mm/backend_elf.c (modified) (view diffs)
• tools/autotool.py (modified) (view diffs)
• tools/toolchain.sh (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cat/cat.h (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cp/cp.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/rm/rm.c (modified) (view diffs)
• uspace/app/sbi/src/run_expr.c (modified) (view diffs)
• uspace/app/tester/fault/fault2.c (modified) (view diffs)
• uspace/app/trace/trace.c (modified) (view diffs)
• uspace/drv/pciintel/pci.c (modified) (view diffs)
• uspace/lib/c/arch/abs32le/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/amd64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/arm32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/ia32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/ia64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/mips32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/ppc32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/sparc64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/generic/net/packet.c (modified) (view diffs)
• uspace/lib/c/generic/net/socket_client.c (modified) (view diffs)
• uspace/lib/c/generic/vfs/vfs.c (modified) (view diffs)
• uspace/lib/c/include/adt/generic_char_map.h (modified) (view diffs)
• uspace/lib/c/include/adt/generic_field.h (modified) (view diffs)
• uspace/lib/c/include/adt/int_map.h (modified) (view diffs)
• uspace/lib/c/include/ipc/services.h (modified) (view diffs)
• uspace/lib/fs/libfs.c (modified) (view diffs)
• uspace/lib/net/tl/socket_core.c (modified) (view diffs)
• uspace/lib/net/tl/tl_common.c (modified) (view diffs)
• uspace/srv/devman/devman.c (modified) (view diffs)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/devman/util.c (modified) (view diffs)
• uspace/srv/devman/util.h (modified) (view diffs)
• uspace/srv/hid/kbd/Makefile (modified) (view diffs)
• uspace/srv/hid/kbd/ctl/pl050.c (deleted)
• uspace/srv/hid/kbd/generic/kbd.c (modified) (view diffs)
• uspace/srv/hid/kbd/include/kbd.h (modified) (view diffs)
• uspace/srv/hid/kbd/port/ns16550.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/z8530.c (modified) (view diffs)
• uspace/srv/hw/bus/cuda_adb/cuda_adb.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/dp8390.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/main.c (modified) (view diffs)
• uspace/srv/net/il/arp/arp.c (modified) (view diffs)
• uspace/srv/net/il/ip/ip.c (modified) (view diffs)
• uspace/srv/net/net/net.c (modified) (view diffs)
• uspace/srv/net/nil/eth/eth.c (modified) (view diffs)
• uspace/srv/net/tl/tcp/tcp.c (modified) (view diffs)
• uspace/srv/net/tl/udp/udp.c (modified) (view diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (view diffs)
• version (modified) (view diffs)