Changeset c2a6983 in mainline for kernel

Timestamp:

2013-10-13T20:59:33Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

12d6c98

Parents:

820104d (diff), 39bcc99 (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/abs32le/include/arch/mm/frame.h (modified) (view diffs)
• arch/abs32le/include/arch/mm/page.h (modified) (view diffs)
• arch/amd64/include/arch/mm/frame.h (modified) (view diffs)
• arch/amd64/include/arch/mm/page.h (modified) (view diffs)
• arch/amd64/src/ddi/ddi.c (modified) (view diffs)
• arch/amd64/src/proc/task.c (modified) (view diffs)
• arch/arm32/include/arch/asm.h (modified) (view diffs)
• arch/arm32/include/arch/cp15.h (modified) (view diffs)
• arch/arm32/include/arch/mm/frame.h (modified) (view diffs)
• arch/arm32/include/arch/mm/page.h (modified) (view diffs)
• arch/arm32/include/arch/mm/page_armv4.h (modified) (view diffs)
• arch/arm32/include/arch/mm/page_armv6.h (modified) (view diffs)
• arch/arm32/src/cpu/cpu.c (modified) (view diffs)
• arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (modified) (view diffs)
• arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (view diffs)
• arch/arm32/src/mm/frame.c (modified) (view diffs)
• arch/arm32/src/mm/page.c (modified) (view diffs)
• arch/arm32/src/mm/tlb.c (modified) (view diffs)
• arch/arm32/src/ras.c (modified) (view diffs)
• arch/ia32/include/arch/mm/frame.h (modified) (view diffs)
• arch/ia32/include/arch/mm/page.h (modified) (view diffs)
• arch/ia32/src/ddi/ddi.c (modified) (view diffs)
• arch/ia32/src/proc/task.c (modified) (view diffs)
• arch/ia64/include/arch/mm/frame.h (modified) (view diffs)
• arch/ia64/src/ddi/ddi.c (modified) (view diffs)
• arch/ia64/src/mm/vhpt.c (modified) (view diffs)
• arch/mips32/include/arch/asm.h (modified) (view diffs)
• arch/mips32/include/arch/mm/frame.h (modified) (view diffs)
• arch/mips32/include/arch/mm/page.h (modified) (view diffs)
• arch/mips32/src/mach/malta/malta.c (modified) (view diffs)
• arch/mips32/src/mm/tlb.c (modified) (view diffs)
• arch/mips64/include/arch/mm/frame.h (modified) (view diffs)
• arch/ppc32/include/arch/mm/frame.h (modified) (view diffs)
• arch/ppc32/include/arch/mm/page.h (modified) (view diffs)
• arch/sparc64/include/arch/mm/frame.h (modified) (view diffs)
• arch/sparc64/include/arch/mm/sun4u/frame.h (modified) (view diffs)
• arch/sparc64/include/arch/mm/sun4v/frame.h (modified) (view diffs)
• arch/sparc64/include/arch/trap/sun4v/mmu.h (modified) (view diffs)
• arch/sparc64/src/mm/sun4u/as.c (modified) (view diffs)
• arch/sparc64/src/mm/sun4v/as.c (modified) (view diffs)
• arch/sparc64/src/mm/sun4v/frame.c (modified) (view diffs)
• arch/sparc64/src/mm/sun4v/tlb.c (modified) (view diffs)
• arch/sparc64/src/sun4v/start.S (modified) (view diffs)
• doc/mm (modified) (view diffs)
• genarch/include/genarch/drivers/am335x/irc.h (modified) (view diffs)
• genarch/include/genarch/drivers/amdm37x/gpt.h (modified) (view diffs)
• genarch/include/genarch/drivers/amdm37x/irc.h (modified) (view diffs)
• genarch/include/genarch/drivers/omap/irc.h (added)
• genarch/include/genarch/mm/page_pt.h (modified) (view diffs)
• genarch/src/mm/as_pt.c (modified) (view diffs)
• genarch/src/mm/page_pt.c (modified) (view diffs)
• generic/include/adt/bitmap.h (modified) (view diffs)
• generic/include/adt/list.h (modified) (view diffs)
• generic/include/config.h (modified) (view diffs)
• generic/include/macros.h (modified) (view diffs)
• generic/include/mm/buddy.h (deleted)
• generic/include/mm/frame.h (modified) (view diffs)
• generic/include/mm/page.h (modified) (view diffs)
• generic/include/mm/slab.h (modified) (view diffs)
• generic/src/adt/bitmap.c (modified) (view diffs)
• generic/src/adt/btree.c (modified) (view diffs)
• generic/src/adt/hash_table.c (modified) (view diffs)
• generic/src/adt/list.c (modified) (view diffs)
• generic/src/console/cmd.c (modified) (view diffs)
• generic/src/console/console.c (modified) (view diffs)
• generic/src/console/kconsole.c (modified) (view diffs)
• generic/src/cpu/cpu.c (modified) (view diffs)
• generic/src/ddi/ddi.c (modified) (view diffs)
• generic/src/debug/panic.c (modified) (view diffs)
• generic/src/debug/stacktrace.c (modified) (view diffs)
• generic/src/ipc/ipc.c (modified) (view diffs)
• generic/src/ipc/ipcrsc.c (modified) (view diffs)
• generic/src/lib/ra.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/buddy.c (deleted)
• generic/src/mm/frame.c (modified) (view diffs)
• generic/src/mm/km.c (modified) (view diffs)
• generic/src/mm/page.c (modified) (view diffs)
• generic/src/mm/slab.c (modified) (view diffs)
• generic/src/proc/scheduler.c (modified) (view diffs)
• generic/src/proc/task.c (modified) (view diffs)
• generic/src/proc/thread.c (modified) (view diffs)
• generic/src/synch/futex.c (modified) (view diffs)
• generic/src/sysinfo/stats.c (modified) (view diffs)
• generic/src/time/clock.c (modified) (view diffs)
• generic/src/udebug/udebug.c (modified) (view diffs)
• generic/src/udebug/udebug_ops.c (modified) (view diffs)
• test/mm/falloc1.c (modified) (view diffs)
• test/mm/falloc2.c (modified) (view diffs)
• test/mm/mapping1.c (modified) (view diffs)