Changeset 8e7c9fe in mainline for kernel

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

Location:

kernel

Files:

• Makefile (modified) (view diffs)
• arch/abs32le/Makefile.inc (modified) (view diffs)
• arch/abs32le/src/ddi/ddi.c (deleted)
• arch/amd64/Makefile.inc (modified) (view diffs)
• arch/amd64/include/arch/context.h (modified) (view diffs)
• arch/amd64/include/arch/context_offset.h (deleted)
• arch/amd64/include/arch/context_struct.ag (added)
• arch/amd64/include/arch/istate.h (modified) (view diffs)
• arch/amd64/include/arch/istate_struct.ag (added)
• arch/amd64/include/arch/mm/km.h (modified) (view diffs)
• arch/amd64/include/arch/mm/page.h (modified) (view diffs)
• arch/amd64/src/asm.S (modified) (view diffs)
• arch/amd64/src/boot/multiboot.S (modified) (view diffs)
• arch/amd64/src/boot/multiboot2.S (modified) (view diffs)
• arch/amd64/src/context.S (modified) (view diffs)
• arch/amd64/src/ddi/ddi.c (modified) (view diffs)
• arch/amd64/src/fpu_context.c (modified) (view diffs)
• arch/amd64/src/mm/km.c (modified) (view diffs)
• arch/arm32/Makefile.inc (modified) (view diffs)
• arch/arm32/include/arch/context.h (modified) (view diffs)
• arch/arm32/include/arch/context_struct.ag (added)
• arch/arm32/include/arch/istate.h (modified) (view diffs)
• arch/arm32/include/arch/istate_struct.ag (added)
• arch/arm32/include/arch/mm/page_armv6.h (modified) (view diffs)
• arch/arm32/src/fpu_context.c (modified) (view diffs)
• arch/ia32/Makefile.inc (modified) (view diffs)
• arch/ia32/include/arch/context.h (modified) (view diffs)
• arch/ia32/include/arch/context_offset.h (deleted)
• arch/ia32/include/arch/context_struct.ag (moved) (moved from kernel/arch/mips64/Makefile.inc ) (view diffs)
• arch/ia32/include/arch/istate.h (modified) (view diffs)
• arch/ia32/include/arch/istate_struct.ag (added)
• arch/ia32/src/asm.S (modified) (view diffs)
• arch/ia32/src/context.S (modified) (view diffs)
• arch/ia32/src/ddi/ddi.c (modified) (view diffs)
• arch/ia32/src/fpu_context.c (modified) (view diffs)
• arch/ia64/Makefile.inc (modified) (view diffs)
• arch/ia64/include/arch/context.h (modified) (view diffs)
• arch/ia64/include/arch/context_struct.ag (added)
• arch/ia64/include/arch/istate.h (modified) (view diffs)
• arch/ia64/include/arch/istate_struct.ag (added)
• arch/ia64/src/context.S (modified) (view diffs)
• arch/ia64/src/ddi/ddi.c (modified) (view diffs)
• arch/ia64/src/drivers/ski.c (modified) (view diffs)
• arch/ia64/src/fpu_context.c (modified) (view diffs)
• arch/ia64/src/ivt.S (modified) (view diffs)
• arch/mips32/Makefile.inc (modified) (view diffs)
• arch/mips32/include/arch/context.h (modified) (view diffs)
• arch/mips32/include/arch/context_offset.h (deleted)
• arch/mips32/include/arch/context_struct.ag (added)
• arch/mips32/include/arch/fpu_context.h (modified) (view diffs)
• arch/mips32/include/arch/fpu_context_struct.ag (moved) (moved from uspace/app/binutils/patch.awk ) (view diffs)
• arch/mips32/include/arch/istate.h (modified) (view diffs)
• arch/mips32/include/arch/istate_struct.ag (added)
• arch/mips32/src/asm.S (modified) (view diffs)
• arch/mips32/src/context.S (modified) (view diffs)
• arch/mips32/src/ddi/ddi.c (deleted)
• arch/mips32/src/debugger.c (modified) (view diffs)
• arch/mips32/src/mach/malta/malta.c (modified) (view diffs)
• arch/mips32/src/start.S (modified) (view diffs)
• arch/mips64/_link.ld.in (deleted)
• arch/mips64/include/arch/asm.h (deleted)
• arch/mips64/include/arch/asm/boot.h (deleted)
• arch/mips64/include/arch/asm/regname.h (deleted)
• arch/mips64/include/arch/atomic.h (deleted)
• arch/mips64/include/arch/barrier.h (deleted)
• arch/mips64/include/arch/context_offset.h (deleted)
• arch/mips64/include/arch/cp0.h (deleted)
• arch/mips64/include/arch/debug.h (deleted)
• arch/mips64/include/arch/debugger.h (deleted)
• arch/mips64/include/arch/drivers/msim.h (deleted)
• arch/mips64/include/arch/exception.h (deleted)
• arch/mips64/include/arch/istate.h (deleted)
• arch/mips64/include/arch/mm/as.h (deleted)
• arch/mips64/include/arch/mm/km.h (deleted)
• arch/mips64/include/arch/mm/tlb.h (deleted)
• arch/mips64/include/arch/smp/dorder.h (deleted)
• arch/mips64/include/arch/types.h (deleted)
• arch/mips64/src/asm.S (deleted)
• arch/mips64/src/cache.c (deleted)
• arch/mips64/src/context.S (deleted)
• arch/mips64/src/cpu (deleted)
• arch/mips64/src/ddi (deleted)
• arch/mips64/src/debug (deleted)
• arch/mips64/src/debugger.c (deleted)
• arch/mips64/src/exception.c (deleted)
• arch/mips64/src/fpu_context.c (deleted)
• arch/mips64/src/interrupt.c (deleted)
• arch/mips64/src/mips64.c (deleted)
• arch/mips64/src/mm/frame.c (deleted)
• arch/mips64/src/mm/km.c (deleted)
• arch/mips64/src/mm/page.c (deleted)
• arch/mips64/src/mm/tlb.c (deleted)
• arch/mips64/src/start.S (deleted)
• arch/ppc32/Makefile.inc (modified) (view diffs)
• arch/ppc32/include/arch/context.h (modified) (view diffs)
• arch/ppc32/include/arch/context_offset.h (deleted)
• arch/ppc32/include/arch/context_struct.ag (added)
• arch/ppc32/include/arch/exception.h (deleted)
• arch/ppc32/include/arch/fpu_context.h (modified) (view diffs)
• arch/ppc32/include/arch/fpu_context_struct.ag (added)
• arch/ppc32/include/arch/interrupt.h (modified) (view diffs)
• arch/ppc32/include/arch/istate.h (modified) (view diffs)
• arch/ppc32/include/arch/istate_struct.ag (added)
• arch/ppc32/include/arch/msr.h (modified) (view diffs)
• arch/ppc32/include/arch/stack.h (modified) (view diffs)
• arch/ppc32/src/asm.S (modified) (view diffs)
• arch/ppc32/src/context.S (modified) (view diffs)
• arch/ppc32/src/cpu/cpu.c (modified) (view diffs)
• arch/ppc32/src/exception.S (modified) (view diffs)
• arch/ppc32/src/fpu_context.S (modified) (view diffs)
• arch/ppc32/src/interrupt.c (modified) (view diffs)
• arch/ppc32/src/ppc32.c (modified) (view diffs)
• arch/sparc32/Makefile.inc (modified) (view diffs)
• arch/sparc32/src/ddi/ddi.c (deleted)
• arch/sparc64/Makefile.inc (modified) (view diffs)
• arch/sparc64/include/arch/context.h (modified) (view diffs)
• arch/sparc64/include/arch/context_offset.h (deleted)
• arch/sparc64/include/arch/context_struct.ag (added)
• arch/sparc64/include/arch/istate.h (modified) (view diffs)
• arch/sparc64/include/arch/istate_struct.ag (moved) (moved from uspace/app/pcc/cc/cc/Makefile ) (view diffs)
• arch/sparc64/include/arch/trap/trap_table.h (modified) (view diffs)
• arch/sparc64/src/context.S (modified) (view diffs)
• arch/sparc64/src/drivers/kbd.c (modified) (view diffs)
• arch/sparc64/src/drivers/niagara.c (modified) (view diffs)
• arch/sparc64/src/drivers/scr.c (modified) (view diffs)
• arch/sparc64/src/smp/sun4v/smp.c (modified) (view diffs)
• arch/sparc64/src/sun4u/start.S (modified) (view diffs)
• arch/sparc64/src/sun4v/start.S (modified) (view diffs)
• genarch/Makefile.inc (modified) (view diffs)
• genarch/include/genarch/fb/fb.h (modified) (view diffs)
• genarch/include/genarch/softint/division.h (modified) (view diffs)
• genarch/src/ddi/ddi-bitmap.c (added)
• genarch/src/ddi/ddi-dummy.c (moved) (moved from kernel/arch/sparc64/src/ddi/ddi.c ) (view diffs)
• genarch/src/drivers/dsrln/dsrlnout.c (modified) (view diffs)
• genarch/src/drivers/ega/ega.c (modified) (view diffs)
• genarch/src/drivers/grlib/uart.c (modified) (view diffs)
• genarch/src/drivers/omap/uart.c (modified) (view diffs)
• genarch/src/drivers/pl011/pl011.c (modified) (view diffs)
• genarch/src/drivers/s3c24xx/uart.c (modified) (view diffs)
• genarch/src/fb/fb.c (modified) (view diffs)
• genarch/src/kbrd/kbrd.c (modified) (view diffs)
• genarch/src/mm/page_pt.c (modified) (view diffs)
• genarch/src/srln/srln.c (modified) (view diffs)
• generic/include/cc.h (modified) (view diffs)
• generic/include/console/chardev.h (modified) (view diffs)
• generic/include/console/console.h (modified) (view diffs)
• generic/include/ddi/ddi.h (modified) (view diffs)
• generic/include/debug.h (modified) (view diffs)
• generic/include/interrupt.h (modified) (view diffs)
• generic/include/ipc/event.h (modified) (view diffs)
• generic/include/ipc/irq.h (modified) (view diffs)
• generic/include/ipc/sysipc.h (modified) (view diffs)
• generic/include/lib/memfnc.h (modified) (view diffs)
• generic/include/memstr.h (modified) (view diffs)
• generic/include/mm/as.h (modified) (view diffs)
• generic/include/typedefs.h (modified) (view diffs)
• generic/src/console/chardev.c (modified) (view diffs)
• generic/src/console/cmd.c (modified) (view diffs)
• generic/src/console/console.c (modified) (view diffs)
• generic/src/ddi/ddi.c (modified) (view diffs)
• generic/src/ipc/event.c (modified) (view diffs)
• generic/src/ipc/irq.c (modified) (view diffs)
• generic/src/ipc/sysipc.c (modified) (view diffs)
• generic/src/mm/as.c (modified) (view diffs)
• generic/src/mm/backend_anon.c (modified) (view diffs)
• generic/src/mm/backend_elf.c (modified) (view diffs)
• generic/src/mm/backend_phys.c (modified) (view diffs)
• generic/src/mm/frame.c (modified) (view diffs)
• generic/src/proc/program.c (modified) (view diffs)
• generic/src/syscall/syscall.c (modified) (view diffs)
• generic/src/udebug/udebug_ipc.c (modified) (view diffs)