Changeset e6a78b9 in mainline for kernel

Timestamp:

2012-06-29T15:31:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c0 (diff), 0bbd13e (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/Makefile.inc (modified) (view diffs)
• arch/amd64/src/userspace.c (modified) (view diffs)
• arch/arm32/src/userspace.c (modified) (view diffs)
• arch/ia32/Makefile.inc (modified) (view diffs)
• arch/ia32/src/userspace.c (modified) (view diffs)
• arch/ia64/src/drivers/ski.c (modified) (view diffs)
• arch/ia64/src/ia64.c (modified) (view diffs)
• arch/mips32/src/mips32.c (modified) (view diffs)
• arch/mips64/src/mips64.c (modified) (view diffs)
• arch/ppc32/src/ppc32.c (modified) (view diffs)
• arch/sparc64/Makefile.inc (modified) (view diffs)
• arch/sparc64/src/drivers/niagara.c (modified) (view diffs)
• arch/sparc64/src/proc/sun4u/scheduler.c (modified) (view diffs)
• arch/sparc64/src/proc/sun4v/scheduler.c (modified) (view diffs)
• arch/sparc64/src/proc/thread.c (modified) (view diffs)
• arch/sparc64/src/sun4u/sparc64.c (modified) (view diffs)
• arch/sparc64/src/sun4v/sparc64.c (modified) (view diffs)
• genarch/src/kbrd/kbrd.c (modified) (view diffs)
• genarch/src/mm/as_ht.c (modified) (view diffs)
• genarch/src/srln/srln.c (modified) (view diffs)
• generic/include/ipc/ipc.h (modified) (view diffs)
• generic/include/ipc/ipcrsc.h (modified) (view diffs)
• generic/include/proc/program.h (modified) (view diffs)
• generic/include/proc/thread.h (modified) (view diffs)
• generic/src/adt/btree.c (modified) (view diffs)
• generic/src/console/cmd.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/lib/ra.c (modified) (view diffs)
• generic/src/lib/rd.c (modified) (view diffs)
• generic/src/main/kinit.c (modified) (view diffs)
• generic/src/main/main.c (modified) (view diffs)
• generic/src/main/uinit.c (modified) (view diffs)
• generic/src/mm/as.c (modified) (view diffs)
• generic/src/mm/slab.c (modified) (view diffs)
• generic/src/proc/program.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/mutex.c (modified) (view diffs)
• generic/src/synch/spinlock.c (modified) (view diffs)
• generic/src/sysinfo/sysinfo.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/slab1.c (modified) (view diffs)
• test/mm/slab2.c (modified) (view diffs)
• test/synch/semaphore1.c (modified) (view diffs)
• test/synch/semaphore2.c (modified) (view diffs)
• test/thread/thread1.c (modified) (view diffs)