Changeset b4ca0a9c in mainline

Timestamp:

2012-07-10T11:53:50Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1e01a35

Parents:

a33706e (diff), 33fc3ae (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:

• HelenOS.config (modified) (view diffs)
• abi/include/proc/uarg.h (modified) (view diffs)
• boot/Makefile.build (modified) (view diffs)
• boot/Makefile.common (modified) (view diffs)
• boot/Makefile.grub (modified) (view diffs)
• kernel/Makefile (modified) (view diffs)
• kernel/arch/abs32le/include/mm/page.h (modified) (view diffs)
• kernel/arch/amd64/Makefile.inc (modified) (view diffs)
• kernel/arch/amd64/include/mm/page.h (modified) (view diffs)
• kernel/arch/amd64/src/mm/page.c (modified) (view diffs)
• kernel/arch/amd64/src/userspace.c (modified) (view diffs)
• kernel/arch/arm32/include/mm/page.h (modified) (view diffs)
• kernel/arch/arm32/src/userspace.c (modified) (view diffs)
• kernel/arch/ia32/Makefile.inc (modified) (view diffs)
• kernel/arch/ia32/include/mm/page.h (modified) (view diffs)
• kernel/arch/ia32/src/mm/page.c (modified) (view diffs)
• kernel/arch/ia32/src/smp/apic.c (modified) (view diffs)
• kernel/arch/ia32/src/userspace.c (modified) (view diffs)
• kernel/arch/ia64/src/drivers/ski.c (modified) (view diffs)
• kernel/arch/ia64/src/ia64.c (modified) (view diffs)
• kernel/arch/mips32/include/mm/page.h (modified) (view diffs)
• kernel/arch/mips32/src/mips32.c (modified) (view diffs)
• kernel/arch/mips64/src/mips64.c (modified) (view diffs)
• kernel/arch/ppc32/include/mm/page.h (modified) (view diffs)
• kernel/arch/ppc32/src/ppc32.c (modified) (view diffs)
• kernel/arch/sparc64/Makefile.inc (modified) (view diffs)
• kernel/arch/sparc64/src/drivers/niagara.c (modified) (view diffs)
• kernel/arch/sparc64/src/proc/sun4u/scheduler.c (modified) (view diffs)
• kernel/arch/sparc64/src/proc/sun4v/scheduler.c (modified) (view diffs)
• kernel/arch/sparc64/src/proc/thread.c (modified) (view diffs)
• kernel/arch/sparc64/src/smp/sun4u/ipi.c (modified) (view diffs)
• kernel/arch/sparc64/src/sun4u/sparc64.c (modified) (view diffs)
• kernel/arch/sparc64/src/sun4v/sparc64.c (modified) (view diffs)
• kernel/genarch/include/mm/page_pt.h (modified) (view diffs)
• kernel/genarch/src/kbrd/kbrd.c (modified) (view diffs)
• kernel/genarch/src/mm/as_ht.c (modified) (view diffs)
• kernel/genarch/src/mm/page_ht.c (modified) (view diffs)
• kernel/genarch/src/mm/page_pt.c (modified) (view diffs)
• kernel/genarch/src/srln/srln.c (modified) (view diffs)
• kernel/generic/include/ipc/ipc.h (modified) (view diffs)
• kernel/generic/include/ipc/ipcrsc.h (modified) (view diffs)
• kernel/generic/include/proc/program.h (modified) (view diffs)
• kernel/generic/include/proc/thread.h (modified) (view diffs)
• kernel/generic/src/adt/btree.c (modified) (view diffs)
• kernel/generic/src/console/cmd.c (modified) (view diffs)
• kernel/generic/src/ipc/ipc.c (modified) (view diffs)
• kernel/generic/src/ipc/kbox.c (modified) (view diffs)
• kernel/generic/src/ipc/sysipc.c (modified) (view diffs)
• kernel/generic/src/lib/ra.c (modified) (view diffs)
• kernel/generic/src/lib/rd.c (modified) (view diffs)
• kernel/generic/src/main/kinit.c (modified) (view diffs)
• kernel/generic/src/main/main.c (modified) (view diffs)
• kernel/generic/src/main/uinit.c (modified) (view diffs)
• kernel/generic/src/mm/as.c (modified) (view diffs)
• kernel/generic/src/mm/slab.c (modified) (view diffs)
• kernel/generic/src/mm/tlb.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/spinlock.c (modified) (view diffs)
• kernel/generic/src/sysinfo/sysinfo.c (modified) (view diffs)
• kernel/generic/src/udebug/udebug.c (modified) (view diffs)
• kernel/generic/src/udebug/udebug_ops.c (modified) (view diffs)
• kernel/test/mm/falloc1.c (modified) (view diffs)
• kernel/test/mm/falloc2.c (modified) (view diffs)
• kernel/test/mm/slab1.c (modified) (view diffs)
• kernel/test/mm/slab2.c (modified) (view diffs)
• kernel/test/synch/semaphore1.c (modified) (view diffs)
• kernel/test/synch/semaphore2.c (modified) (view diffs)
• kernel/test/thread/thread1.c (modified) (view diffs)
• tools/autotool.py (modified) (view diffs)
• tools/dest_build.py (added)
• tools/toolchain.sh (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/Makefile.common (modified) (view diffs)
• uspace/app/devctl/devctl.c (modified) (view diffs)
• uspace/app/killall/killall.c (modified) (view diffs)
• uspace/app/loc/loc.c (modified) (view diffs)
• uspace/app/msim/Makefile (added)
• uspace/app/msim/Makefile.msim.src (added)
• uspace/app/msim/arch_helenos/helenos.h (added)
• uspace/app/msim/arch_helenos/input.c (added)
• uspace/app/msim/arch_helenos/misc.c (added)
• uspace/app/msim/config.h.msim (added)
• uspace/app/nettest1/nettest1.c (modified) (view diffs)
• uspace/app/nettest2/nettest2.c (modified) (view diffs)
• uspace/app/sbi/src/mytypes.h (modified) (view diffs)
• uspace/app/sysinfo/sysinfo.c (modified) (view diffs)
• uspace/app/tester/hw/misc/virtchar1.c (modified) (view diffs)
• uspace/app/tester/mm/common.c (modified) (view diffs)
• uspace/app/tester/mm/mapping1.c (modified) (view diffs)
• uspace/app/trace/proto.h (modified) (view diffs)
• uspace/app/websrv/websrv.c (modified) (view diffs)
• uspace/drv/bus/isa/isa.c (modified) (view diffs)
• uspace/drv/bus/usb/ehci/res.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/utils/malloc32.h (modified) (view diffs)
• uspace/drv/bus/usb/uhci/res.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/utils/malloc32.h (modified) (view diffs)
• uspace/drv/bus/usb/usbmast/main.c (modified) (view diffs)
• uspace/lib/c/arch/ia64/include/fibril.h (modified) (view diffs)
• uspace/lib/c/arch/ia64/include/thread.h (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/devman.c (modified) (view diffs)
• uspace/lib/c/generic/elf/elf_load.c (modified) (view diffs)
• uspace/lib/c/generic/fibril.c (modified) (view diffs)
• uspace/lib/c/generic/inet.c (modified) (view diffs)
• uspace/lib/c/generic/inetcfg.c (modified) (view diffs)
• uspace/lib/c/generic/inetping.c (modified) (view diffs)
• uspace/lib/c/generic/iplink.c (modified) (view diffs)
• uspace/lib/c/generic/loc.c (modified) (view diffs)
• uspace/lib/c/generic/malloc.c (modified) (view diffs)
• uspace/lib/c/generic/mman.c (modified) (view diffs)
• uspace/lib/c/generic/net/socket_client.c (modified) (view diffs)
• uspace/lib/c/generic/stacktrace.c (modified) (view diffs)
• 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/include/as.h (modified) (view diffs)
• uspace/lib/c/include/devman.h (modified) (view diffs)
• uspace/lib/c/include/errno.h (modified) (view diffs)
• uspace/lib/c/include/fibril.h (modified) (view diffs)
• uspace/lib/c/include/ipc/devman.h (modified) (view diffs)
• uspace/lib/c/include/ipc/loc.h (modified) (view diffs)
• uspace/lib/c/include/loc.h (modified) (view diffs)
• uspace/lib/c/include/stdarg.h (modified) (view diffs)
• uspace/lib/c/include/stdio.h (modified) (view diffs)
• uspace/lib/c/include/sys/mman.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/interrupt.c (modified) (view diffs)
• uspace/lib/drv/generic/log.c (modified) (view diffs)
• uspace/lib/drv/generic/logbuf.c (modified) (view diffs)
• uspace/lib/drv/include/ddf/driver.h (modified) (view diffs)
• uspace/lib/drv/include/ddf/interrupt.h (modified) (view diffs)
• uspace/lib/drv/include/ops/hw_res.h (modified) (view diffs)
• uspace/lib/drv/include/ops/nic.h (modified) (view diffs)
• uspace/lib/fb/imgmap.c (modified) (view diffs)
• uspace/lib/fb/screenbuffer.c (modified) (view diffs)
• uspace/lib/fs/libfs.c (modified) (view diffs)
• uspace/lib/nic/include/nic.h (modified) (view diffs)
• uspace/lib/nic/include/nic_impl.h (modified) (view diffs)
• uspace/lib/nic/src/nic_driver.c (modified) (view diffs)
• uspace/lib/posix/Makefile (modified) (view diffs)
• uspace/lib/posix/errno.h (modified) (view diffs)
• uspace/lib/posix/getopt.c (added)
• uspace/lib/posix/getopt.h (added)
• uspace/lib/posix/pwd.c (modified) (view diffs)
• uspace/lib/posix/stdbool.h (modified) (view diffs)
• uspace/lib/posix/stdio.h (modified) (view diffs)
• uspace/lib/posix/time.c (modified) (view diffs)
• uspace/lib/posix/unistd.c (modified) (view diffs)
• uspace/lib/posix/unistd.h (modified) (view diffs)
• uspace/lib/usb/include/usb/ddfiface.h (modified) (view diffs)
• uspace/lib/usb/include/usb/debug.h (modified) (view diffs)
• uspace/lib/usb/src/ddfiface.c (modified) (view diffs)
• uspace/lib/usb/src/hc.c (modified) (view diffs)
• uspace/lib/usbdev/include/usb/dev/driver.h (modified) (view diffs)
• uspace/lib/usbdev/include/usb/dev/hub.h (modified) (view diffs)
• uspace/lib/usbdev/include/usb/dev/recognise.h (modified) (view diffs)
• uspace/lib/usbdev/src/altiface.c (modified) (view diffs)
• uspace/lib/usbdev/src/hub.c (modified) (view diffs)
• uspace/lib/usbdev/src/recognise.c (modified) (view diffs)
• uspace/lib/usbhid/src/hidiface.c (modified) (view diffs)
• uspace/lib/usbhost/include/usb/host/hcd.h (modified) (view diffs)
• uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h (modified) (view diffs)
• uspace/lib/usbhost/src/iface.c (modified) (view diffs)
• uspace/lib/usbvirt/src/device.c (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_bd.c (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/clipboard/clipboard.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_dentry.c (modified) (view diffs)
• uspace/srv/hid/console/console.c (modified) (view diffs)
• uspace/srv/hid/fb/fb.c (modified) (view diffs)
• uspace/srv/hid/input/ctl/kbdev.c (modified) (view diffs)
• uspace/srv/hid/input/generic/input.c (modified) (view diffs)
• uspace/srv/hid/input/port/adb.c (modified) (view diffs)
• uspace/srv/hid/input/proto/mousedev.c (modified) (view diffs)
• uspace/srv/hid/remcons/remcons.c (modified) (view diffs)
• uspace/srv/hid/remcons/telnet.h (modified) (view diffs)
• uspace/srv/hid/remcons/user.h (modified) (view diffs)
• uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• uspace/srv/loader/main.c (modified) (view diffs)
• uspace/srv/locsrv/locsrv.c (modified) (view diffs)
• uspace/srv/locsrv/locsrv.h (modified) (view diffs)
• uspace/srv/net/ethip/ethip.c (modified) (view diffs)
• uspace/srv/net/ethip/ethip_nic.c (modified) (view diffs)
• uspace/srv/net/inetsrv/inetsrv.c (modified) (view diffs)
• uspace/srv/net/loopip/loopip.c (modified) (view diffs)
• uspace/srv/net/tcp/sock.c (modified) (view diffs)
• uspace/srv/net/udp/sock.c (modified) (view diffs)
• uspace/srv/net/udp/udp.c (modified) (view diffs)
• uspace/srv/net/udp/udp_type.h (modified) (view diffs)
• uspace/srv/ns/ns.c (modified) (view diffs)
• uspace/srv/vfs/vfs.c (modified) (view diffs)