Changeset 925a21e in mainline for kernel

Timestamp:

2011-09-24T14:20:29Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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/istate.h (modified) (view diffs)
• arch/abs32le/include/mm/frame.h (modified) (view diffs)
• arch/abs32le/include/mm/page.h (modified) (view diffs)
• arch/abs32le/src/userspace.c (modified) (view diffs)
• arch/amd64/include/asm.h (modified) (view diffs)
• arch/amd64/include/context.h (modified) (view diffs)
• arch/amd64/include/istate.h (modified) (view diffs)
• arch/amd64/include/mm/frame.h (modified) (view diffs)
• arch/amd64/include/mm/page.h (modified) (view diffs)
• arch/amd64/src/userspace.c (modified) (view diffs)
• arch/arm32/include/istate.h (modified) (view diffs)
• arch/arm32/include/mainpage.h (deleted)
• arch/arm32/include/mm/frame.h (modified) (view diffs)
• arch/arm32/include/mm/page.h (modified) (view diffs)
• arch/arm32/include/regutils.h (modified) (view diffs)
• arch/arm32/src/arm32.c (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/testarm/testarm.c (modified) (view diffs)
• arch/arm32/src/ras.c (modified) (view diffs)
• arch/ia32/Makefile.inc (modified) (view diffs)
• arch/ia32/include/asm.h (modified) (view diffs)
• arch/ia32/include/atomic.h (modified) (view diffs)
• arch/ia32/include/boot/boot.h (modified) (view diffs)
• arch/ia32/include/context.h (modified) (view diffs)
• arch/ia32/include/cycle.h (modified) (view diffs)
• arch/ia32/include/elf.h (modified) (view diffs)
• arch/ia32/include/istate.h (modified) (view diffs)
• arch/ia32/include/mm/frame.h (modified) (view diffs)
• arch/ia32/include/mm/page.h (modified) (view diffs)
• arch/ia32/src/asm.S (modified) (view diffs)
• arch/ia32/src/boot/boot.S (modified) (view diffs)
• arch/ia32/src/cpu/cpu.c (modified) (view diffs)
• arch/ia32/src/drivers/vesa.c (modified) (view diffs)
• arch/ia32/src/proc/scheduler.c (modified) (view diffs)
• arch/ia32/src/smp/smp.c (modified) (view diffs)
• arch/ia32/src/syscall.c (modified) (view diffs)
• arch/ia32/src/userspace.c (modified) (view diffs)
• arch/ia64/include/elf.h (modified) (view diffs)
• arch/ia64/include/istate.h (modified) (view diffs)
• arch/ia64/include/mm/frame.h (modified) (view diffs)
• arch/ia64/include/mm/page.h (modified) (view diffs)
• arch/ia64/include/register.h (modified) (view diffs)
• arch/ia64/src/ia64.c (modified) (view diffs)
• arch/mips32/include/context_offset.h (modified) (view diffs)
• arch/mips32/include/cp0.h (modified) (view diffs)
• arch/mips32/include/istate.h (modified) (view diffs)
• arch/mips32/include/mm/frame.h (modified) (view diffs)
• arch/mips32/include/mm/page.h (modified) (view diffs)
• arch/mips32/src/mips32.c (modified) (view diffs)
• arch/mips64/include/context_offset.h (modified) (view diffs)
• arch/mips64/include/cp0.h (modified) (view diffs)
• arch/mips64/include/istate.h (modified) (view diffs)
• arch/mips64/include/mm/frame.h (modified) (view diffs)
• arch/mips64/include/mm/page.h (modified) (view diffs)
• arch/mips64/src/mips64.c (modified) (view diffs)
• arch/ppc32/include/asm.h (modified) (view diffs)
• arch/ppc32/include/context_offset.h (modified) (view diffs)
• arch/ppc32/include/cpu.h (modified) (view diffs)
• arch/ppc32/include/exception.h (modified) (view diffs)
• arch/ppc32/include/istate.h (modified) (view diffs)
• arch/ppc32/include/mm/frame.h (modified) (view diffs)
• arch/ppc32/include/mm/page.h (modified) (view diffs)
• arch/ppc32/include/msr.h (added)
• arch/ppc32/src/asm.S (modified) (view diffs)
• arch/ppc32/src/exception.S (modified) (view diffs)
• arch/ppc32/src/ppc32.c (modified) (view diffs)
• arch/sparc64/include/barrier.h (modified) (view diffs)
• arch/sparc64/include/elf.h (modified) (view diffs)
• arch/sparc64/include/istate.h (modified) (view diffs)
• arch/sparc64/include/mm/page.h (modified) (view diffs)
• arch/sparc64/include/mm/sun4u/frame.h (modified) (view diffs)
• arch/sparc64/include/mm/sun4v/frame.h (modified) (view diffs)
• arch/sparc64/include/mm/sun4v/page.h (modified) (view diffs)
• arch/sparc64/include/sun4v/regdef.h (modified) (view diffs)
• arch/sparc64/src/drivers/scr.c (modified) (view diffs)
• arch/sparc64/src/smp/sun4u/smp.c (modified) (view diffs)
• arch/sparc64/src/smp/sun4v/smp.c (modified) (view diffs)
• arch/sparc64/src/sun4v/start.S (modified) (view diffs)
• genarch/include/fb/fb.h (modified) (view diffs)
• genarch/src/fb/fb.c (modified) (view diffs)
• generic/include/adt/list.h (modified) (view diffs)
• generic/include/console/console.h (modified) (view diffs)
• generic/include/ddi/ddi.h (modified) (view diffs)
• generic/include/ddi/irq.h (modified) (view diffs)
• generic/include/errno.h (modified) (view diffs)
• generic/include/ipc/event.h (modified) (view diffs)
• generic/include/ipc/ipc.h (modified) (view diffs)
• generic/include/lib/elf.h (modified) (view diffs)
• generic/include/mm/as.h (modified) (view diffs)
• generic/include/proc/task.h (modified) (view diffs)
• generic/include/proc/thread.h (modified) (view diffs)
• generic/include/synch/condvar.h (modified) (view diffs)
• generic/include/synch/mutex.h (modified) (view diffs)
• generic/include/synch/semaphore.h (modified) (view diffs)
• generic/include/synch/waitq.h (modified) (view diffs)
• generic/include/syscall/syscall.h (modified) (view diffs)
• generic/include/sysinfo/sysinfo.h (modified) (view diffs)
• generic/include/typedefs.h (modified) (view diffs)
• generic/include/udebug/udebug.h (modified) (view diffs)
• generic/src/adt/btree.c (modified) (view diffs)
• generic/src/adt/list.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/ipc.c (modified) (view diffs)
• generic/src/ipc/kbox.c (modified) (view diffs)
• generic/src/ipc/sysipc.c (modified) (view diffs)
• generic/src/mm/frame.c (modified) (view diffs)
• generic/src/mm/slab.c (modified) (view diffs)
• generic/src/printf/printf_core.c (modified) (view diffs)
• generic/src/proc/program.c (modified) (view diffs)
• generic/src/proc/task.c (modified) (view diffs)
• generic/src/proc/thread.c (modified) (view diffs)
• generic/src/synch/condvar.c (modified) (view diffs)
• generic/src/synch/futex.c (modified) (view diffs)
• generic/src/synch/mutex.c (modified) (view diffs)
• generic/src/synch/semaphore.c (modified) (view diffs)
• generic/src/synch/waitq.c (modified) (view diffs)
• generic/src/syscall/syscall.c (modified) (view diffs)
• generic/src/sysinfo/stats.c (modified) (view diffs)
• generic/src/sysinfo/sysinfo.c (modified) (view diffs)
• test/print/print2.c (modified) (view diffs)
• test/synch/semaphore2.c (modified) (view diffs)