Changeset 8b655705 in mainline for kernel

Timestamp:

2011-04-15T19:38:07Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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/memstr.h (deleted)
• arch/amd64/Makefile.inc (modified) (view diffs)
• arch/amd64/_link.ld.in (modified) (view diffs)
• arch/amd64/src/asm.S (modified) (view diffs)
• arch/arm32/src/asm.S (modified) (view diffs)
• arch/arm32/src/exception.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/ia32/_link.ld.in (modified) (view diffs)
• arch/ia32/src/asm.S (modified) (view diffs)
• arch/ia32/src/cpu/cpu.c (modified) (view diffs)
• arch/ia64/_link.ld.in (modified) (view diffs)
• arch/ia64/src/asm.S (modified) (view diffs)
• arch/ia64/src/ivt.S (modified) (view diffs)
• arch/ia64/src/mm/tlb.c (modified) (view diffs)
• arch/ia64/src/start.S (modified) (view diffs)
• arch/mips32/include/atomic.h (modified) (view diffs)
• arch/mips32/include/cp0.h (modified) (view diffs)
• arch/mips32/include/memstr.h (deleted)
• arch/mips32/src/asm.S (modified) (view diffs)
• arch/mips32/src/mm/tlb.c (modified) (view diffs)
• arch/ppc32/_link.ld.in (modified) (view diffs)
• arch/ppc32/include/memstr.h (deleted)
• arch/ppc32/src/asm.S (modified) (view diffs)
• arch/sparc64/_link.ld.in (modified) (view diffs)
• arch/sparc64/include/memstr.h (deleted)
• arch/sparc64/src/asm.S (modified) (view diffs)
• arch/sparc64/src/drivers/niagara.c (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/smp/sun4v/smp.c (modified) (view diffs)
• arch/sparc64/src/sun4v/asm.S (modified) (view diffs)
• arch/sparc64/src/sun4v/start.S (modified) (view diffs)
• arch/sparc64/src/trap/sun4v/interrupt.c (modified) (view diffs)
• genarch/Makefile.inc (modified) (view diffs)
• genarch/src/drivers/via-cuda/cuda.c (modified) (view diffs)
• genarch/src/kbrd/kbrd_pl050.c (deleted)
• genarch/src/kbrd/scanc_pl050.c (deleted)
• genarch/src/ofw/ebus.c (modified) (view diffs)
• genarch/src/ofw/fhc.c (modified) (view diffs)
• genarch/src/ofw/ofw_tree.c (modified) (view diffs)
• genarch/src/ofw/pci.c (modified) (view diffs)
• genarch/src/ofw/upa.c (modified) (view diffs)
• generic/include/ddi/ddi.h (modified) (view diffs)
• generic/include/debug.h (modified) (view diffs)
• generic/include/ipc/event_types.h (modified) (view diffs)
• generic/include/ipc/ipc.h (modified) (view diffs)
• generic/include/ipc/sysipc.h (modified) (view diffs)
• generic/include/lib/memfnc.h (moved) (moved from kernel/arch/ia64/include/memstr.h ) (view diffs)
• generic/include/memstr.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/syscall/syscall.h (modified) (view diffs)
• generic/include/sysinfo/abi.h (modified) (view diffs)
• generic/include/sysinfo/sysinfo.h (modified) (view diffs)
• generic/include/udebug/udebug.h (modified) (view diffs)
• generic/src/adt/avl.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/interrupt/interrupt.c (modified) (view diffs)
• generic/src/ipc/ipc.c (modified) (view diffs)
• generic/src/ipc/irq.c (modified) (view diffs)
• generic/src/ipc/sysipc.c (modified) (view diffs)
• generic/src/lib/elf.c (modified) (view diffs)
• generic/src/lib/memfnc.c (moved) (moved from kernel/generic/include/proc/tasklet.h ) (view diffs)
• generic/src/lib/memstr.c (modified) (view diffs)
• generic/src/lib/rd.c (modified) (view diffs)
• generic/src/main/main.c (modified) (view diffs)
• generic/src/mm/as.c (modified) (view diffs)
• generic/src/mm/backend_elf.c (modified) (view diffs)
• generic/src/mm/backend_phys.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/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)
• generic/src/time/clock.c (modified) (view diffs)
• tools/genmap.py (modified) (view diffs)