Changeset 0dc2fec in mainline

Timestamp:

2016-05-22T19:19:43Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (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)
• boot/arch/arm32/Makefile.inc (modified) (view diffs)
• contrib/qemu/build-from-scratch.sh (modified) (view diffs)
• kernel/Makefile (modified) (view diffs)
• kernel/arch/abs32le/include/arch/barrier.h (modified) (view diffs)
• kernel/arch/amd64/Makefile.inc (modified) (view diffs)
• kernel/arch/amd64/include/arch/asm.h (modified) (view diffs)
• kernel/arch/amd64/include/arch/boot/memmap_struct.ag (added)
• kernel/arch/amd64/include/arch/cpu.h (modified) (view diffs)
• kernel/arch/amd64/include/arch/interrupt.h (modified) (view diffs)
• kernel/arch/amd64/src/amd64.c (modified) (view diffs)
• kernel/arch/amd64/src/asm.S (modified) (view diffs)
• kernel/arch/amd64/src/boot/multiboot.S (modified) (view diffs)
• kernel/arch/amd64/src/boot/multiboot2.S (modified) (view diffs)
• kernel/arch/amd64/src/context.S (modified) (view diffs)
• kernel/arch/amd64/src/cpu/cpu.c (modified) (view diffs)
• kernel/arch/amd64/src/interrupt.c (modified) (view diffs)
• kernel/arch/amd64/src/mm/page.c (modified) (view diffs)
• kernel/arch/amd64/src/pm.c (modified) (view diffs)
• kernel/arch/amd64/src/smp/ap.S (modified) (view diffs)
• kernel/arch/amd64/src/syscall.c (modified) (view diffs)
• kernel/arch/amd64/src/userspace.c (modified) (view diffs)
• kernel/arch/arm32/include/arch/barrier.h (modified) (view diffs)
• kernel/arch/ia32/Makefile.inc (modified) (view diffs)
• kernel/arch/ia32/include/arch/asm.h (modified) (view diffs)
• kernel/arch/ia32/include/arch/barrier.h (modified) (view diffs)
• kernel/arch/ia32/include/arch/boot/memmap.h (modified) (view diffs)
• kernel/arch/ia32/include/arch/boot/memmap_struct.ag (added)
• kernel/arch/ia32/include/arch/cpu.h (modified) (view diffs)
• kernel/arch/ia32/include/arch/cpuid.h (modified) (view diffs)
• kernel/arch/ia32/include/arch/interrupt.h (modified) (view diffs)
• kernel/arch/ia32/include/arch/mm/page.h (modified) (view diffs)
• kernel/arch/ia32/include/arch/smp/apic.h (modified) (view diffs)
• kernel/arch/ia32/src/asm.S (modified) (view diffs)
• kernel/arch/ia32/src/boot/multiboot.S (modified) (view diffs)
• kernel/arch/ia32/src/boot/vesa_real.inc (modified) (view diffs)
• kernel/arch/ia32/src/cpu/cpu.c (modified) (view diffs)
• kernel/arch/ia32/src/interrupt.c (modified) (view diffs)
• kernel/arch/ia32/src/mm/page.c (modified) (view diffs)
• kernel/arch/ia32/src/pm.c (modified) (view diffs)
• kernel/arch/ia32/src/smp/ap.S (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/include/arch/barrier.h (modified) (view diffs)
• kernel/arch/ia64/include/arch/mm/page.h (modified) (view diffs)
• kernel/arch/mips32/include/arch/barrier.h (modified) (view diffs)
• kernel/arch/ppc32/include/arch/barrier.h (modified) (view diffs)
• kernel/arch/sparc32/include/arch/barrier.h (modified) (view diffs)
• kernel/arch/sparc64/include/arch/barrier.h (modified) (view diffs)
• kernel/genarch/Makefile.inc (modified) (view diffs)
• kernel/genarch/include/genarch/kbrd/scanc_at.h (moved) (moved from kernel/genarch/include/genarch/kbrd/scanc_pl050.h ) (view diffs)
• kernel/genarch/include/genarch/multiboot/multiboot.h (modified) (view diffs)
• kernel/genarch/include/genarch/multiboot/multiboot_info_struct.ag (added)
• kernel/genarch/include/genarch/multiboot/multiboot_memmap_struct.ag (added)
• kernel/genarch/src/drivers/grlib/uart.c (modified) (view diffs)
• kernel/genarch/src/kbrd/kbrd_at.c (added)
• kernel/genarch/src/kbrd/scanc_at.c (added)
• kernel/generic/include/adt/list.h (modified) (view diffs)
• kernel/generic/src/adt/cht.c (modified) (view diffs)
• kernel/generic/src/main/kinit.c (modified) (view diffs)
• tools/autogen.py (modified) (view diffs)
• tools/ew.py (modified) (view diffs)
• tools/toolchain.sh (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/Makefile.common (modified) (view diffs)
• uspace/app/barber/Makefile (modified) (view diffs)
• uspace/app/rcubench/Makefile (modified) (view diffs)
• uspace/app/rcutest/Makefile (modified) (view diffs)
• uspace/app/sbi/src/bigint.c (modified) (view diffs)
• uspace/app/tetris/tetris.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hw_struct/hcca.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/ohci_regs.h (modified) (view diffs)
• uspace/drv/bus/usb/uhci/uhci_batch.c (modified) (view diffs)
• uspace/drv/char/atkbd/Makefile (moved) (moved from uspace/lib/urcu/Makefile ) (view diffs)
• uspace/drv/char/atkbd/atkbd.c (added)
• uspace/drv/char/atkbd/atkbd.h (added)
• uspace/drv/char/atkbd/atkbd.ma (added)
• uspace/drv/char/atkbd/main.c (added)
• uspace/drv/char/pl050/pl050.c (modified) (view diffs)
• uspace/lib/c/Makefile (modified) (view diffs)
• uspace/lib/c/generic/double_to_str.c (modified) (view diffs)
• uspace/lib/c/generic/fibril.c (modified) (view diffs)
• uspace/lib/c/generic/ieee_double.c (modified) (view diffs)
• uspace/lib/c/generic/rcu.c (moved) (moved from uspace/lib/urcu/rcu.c ) (view diffs)
• uspace/lib/c/include/assert.h (modified) (view diffs)
• uspace/lib/c/include/rcu.h (moved) (moved from uspace/lib/urcu/rcu.h ) (view diffs)
• uspace/lib/ext4/Makefile (modified) (view diffs)
• uspace/lib/nic/Makefile (modified) (view diffs)
• uspace/lib/pcut/Makefile (modified) (view diffs)
• uspace/lib/pcut/update-from-master.sh (modified) (view diffs)
• uspace/lib/posix/source/fnmatch.c (modified) (view diffs)
• uspace/lib/usb/include/usb/usb.h (modified) (view diffs)
• uspace/lib/usbdev/include/usb/dev/request.h (modified) (view diffs)
• uspace/lib/usbdev/src/pipesinit.c (modified) (view diffs)
• uspace/lib/usbdev/src/request.c (modified) (view diffs)
• uspace/srv/net/inetsrv/pdu.c (modified) (view diffs)