Changeset b0b4592e in mainline for kernel

Timestamp:

2014-03-15T19:21:53Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c773adc

Parents:

2034f98 (diff), 8cffdf5 (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

Location:

kernel

Files:

• Makefile (modified) (view diffs)
• arch/amd64/src/interrupt.c (modified) (view diffs)
• arch/arm32/Makefile.inc (modified) (view diffs)
• arch/arm32/_link.ld.in (modified) (view diffs)
• arch/arm32/include/arch/cp15.h (modified) (view diffs)
• arch/arm32/include/arch/mach/integratorcp/integratorcp.h (modified) (view diffs)
• arch/arm32/include/arch/mach/raspberrypi/raspberrypi.h (added)
• arch/arm32/include/arch/mm/frame.h (modified) (view diffs)
• arch/arm32/include/arch/mm/page_armv6.h (modified) (view diffs)
• arch/arm32/src/mach/gta02/gta02.c (modified) (view diffs)
• arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (view diffs)
• arch/arm32/src/mach/raspberrypi/raspberrypi.c (added)
• arch/arm32/src/machine_func.c (modified) (view diffs)
• arch/ia32/src/drivers/i8259.c (modified) (view diffs)
• arch/ia32/src/smp/apic.c (modified) (view diffs)
• arch/ia32/src/smp/mps.c (modified) (view diffs)
• arch/ia32/src/smp/smp.c (modified) (view diffs)
• arch/mips32/src/debugger.c (modified) (view diffs)
• arch/mips32/src/exception.c (modified) (view diffs)
• arch/mips32/src/mm/tlb.c (modified) (view diffs)
• arch/ppc32/src/interrupt.c (modified) (view diffs)
• arch/sparc32/Makefile.inc (added)
• arch/sparc32/_link.ld.in (added)
• arch/sparc32/include/arch/ambapp.h (added)
• arch/sparc32/include/arch/arch.h (added)
• arch/sparc32/include/arch/asm.h (added)
• arch/sparc32/include/arch/atomic.h (added)
• arch/sparc32/include/arch/barrier.h (added)
• arch/sparc32/include/arch/context.h (added)
• arch/sparc32/include/arch/context_offset.h (added)
• arch/sparc32/include/arch/cpu.h (added)
• arch/sparc32/include/arch/cycle.h (added)
• arch/sparc32/include/arch/elf.h (added)
• arch/sparc32/include/arch/exception.h (added)
• arch/sparc32/include/arch/faddr.h (added)
• arch/sparc32/include/arch/fpu_context.h (added)
• arch/sparc32/include/arch/interrupt.h (added)
• arch/sparc32/include/arch/istate.h (added)
• arch/sparc32/include/arch/machine/leon3/leon3.h (added)
• arch/sparc32/include/arch/machine_func.h (added)
• arch/sparc32/include/arch/mm/as.h (added)
• arch/sparc32/include/arch/mm/asid.h (added)
• arch/sparc32/include/arch/mm/frame.h (added)
• arch/sparc32/include/arch/mm/km.h (added)
• arch/sparc32/include/arch/mm/page.h (added)
• arch/sparc32/include/arch/mm/page_fault.h (added)
• arch/sparc32/include/arch/mm/tlb.h (added)
• arch/sparc32/include/arch/proc/task.h (added)
• arch/sparc32/include/arch/proc/thread.h (added)
• arch/sparc32/include/arch/register.h (added)
• arch/sparc32/include/arch/regwin.h (added)
• arch/sparc32/include/arch/stack.h (added)
• arch/sparc32/include/arch/trap.h (added)
• arch/sparc32/include/arch/types.h (added)
• arch/sparc32/src/context.S (added)
• arch/sparc32/src/cpu/cpu.c (added)
• arch/sparc32/src/ddi/ddi.c (added)
• arch/sparc32/src/debug/stacktrace.c (added)
• arch/sparc32/src/exception.c (added)
• arch/sparc32/src/machine/leon3/leon3.c (added)
• arch/sparc32/src/machine_func.c (added)
• arch/sparc32/src/mm/as.c (added)
• arch/sparc32/src/mm/frame.c (added)
• arch/sparc32/src/mm/km.c (added)
• arch/sparc32/src/mm/page.c (added)
• arch/sparc32/src/mm/tlb.c (added)
• arch/sparc32/src/proc/scheduler.c (added)
• arch/sparc32/src/proc/task.c (added)
• arch/sparc32/src/proc/thread.c (added)
• arch/sparc32/src/smp/ipi.c (added)
• arch/sparc32/src/smp/smp.c (moved) (moved from uspace/lib/softfloat/other.c ) (view diffs)
• arch/sparc32/src/sparc32.c (added)
• arch/sparc32/src/start.S (added)
• arch/sparc32/src/trap_table.S (added)
• arch/sparc32/src/userspace.c (added)
• arch/sparc64/src/drivers/kbd.c (modified) (view diffs)
• arch/sparc64/src/drivers/pci.c (modified) (view diffs)
• arch/sparc64/src/drivers/scr.c (modified) (view diffs)
• arch/sparc64/src/mm/sun4v/tlb.c (modified) (view diffs)
• arch/sparc64/src/smp/sun4u/smp.c (modified) (view diffs)
• arch/sparc64/src/sun4v/md.c (modified) (view diffs)
• arch/sparc64/src/trap/sun4u/interrupt.c (modified) (view diffs)
• arch/sparc64/src/trap/sun4v/interrupt.c (modified) (view diffs)
• doc/doxygroups.h (modified) (view diffs)
• genarch/Makefile.inc (modified) (view diffs)
• genarch/include/genarch/drivers/arm926_uart/arm926_uart.h (deleted)
• genarch/include/genarch/drivers/bcm2835/irc.h (added)
• genarch/include/genarch/drivers/bcm2835/mbox.h (added)
• genarch/include/genarch/drivers/bcm2835/timer.h (added)
• genarch/include/genarch/drivers/grlib/irqmp.h (moved) (moved from uspace/lib/c/include/math.h ) (view diffs)
• genarch/include/genarch/drivers/grlib/timer.h (added)
• genarch/include/genarch/drivers/grlib/uart.h (added)
• genarch/include/genarch/drivers/pl011/pl011.h (added)
• genarch/include/genarch/drivers/s3c24xx/irqc.h (moved) (moved from kernel/genarch/include/genarch/drivers/s3c24xx_irqc/s3c24xx_irqc.h ) (view diffs)
• genarch/include/genarch/drivers/s3c24xx/timer.h (moved) (moved from kernel/genarch/include/genarch/drivers/s3c24xx_timer/s3c24xx_timer.h ) (view diffs)
• genarch/include/genarch/drivers/s3c24xx/uart.h (moved) (moved from kernel/genarch/include/genarch/drivers/s3c24xx_uart/s3c24xx_uart.h ) (view diffs)
• genarch/src/acpi/acpi.c (modified) (view diffs)
• genarch/src/acpi/madt.c (modified) (view diffs)
• genarch/src/drivers/bcm2835/mbox.c (added)
• genarch/src/drivers/grlib/irqmp.c (moved) (moved from uspace/lib/c/generic/device/battery_dev.c ) (view diffs)
• genarch/src/drivers/grlib/uart.c (added)
• genarch/src/drivers/pl011/pl011.c (moved) (moved from kernel/genarch/src/drivers/arm926_uart/arm926_uart.c ) (view diffs)
• genarch/src/drivers/s3c24xx/irqc.c (moved) (moved from kernel/genarch/src/drivers/s3c24xx_irqc/s3c24xx_irqc.c ) (view diffs)
• genarch/src/drivers/s3c24xx/uart.c (moved) (moved from kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c ) (view diffs)
• genarch/src/drivers/via-cuda/cuda.c (modified) (view diffs)
• generic/include/console/console.h (modified) (view diffs)
• generic/include/debug.h (modified) (view diffs)
• generic/include/log.h (added)
• generic/include/mm/as.h (modified) (view diffs)
• generic/include/synch/spinlock.h (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/lib/func.c (modified) (view diffs)
• generic/src/lib/memfnc.c (modified) (view diffs)
• generic/src/lib/rd.c (modified) (view diffs)
• generic/src/log/log.c (added)
• generic/src/main/kinit.c (modified) (view diffs)
• generic/src/main/main.c (modified) (view diffs)
• generic/src/main/shutdown.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/proc/scheduler.c (modified) (view diffs)
• generic/src/syscall/syscall.c (modified) (view diffs)