Changeset 985e26d2 in mainline for kernel

Timestamp:

2010-01-07T19:06:59Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8190e63

Parents:

743e17b (diff), eca2435 (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)
• Makefile.build (added)
• Makefile.common (added)
• arch/amd64/Makefile.inc (modified) (view diffs)
• arch/amd64/include/mm/page.h (modified) (view diffs)
• arch/amd64/include/types.h (modified) (view diffs)
• arch/amd64/src/amd64.c (modified) (view diffs)
• arch/amd64/src/cpu/cpu.c (modified) (view diffs)
• arch/amd64/src/interrupt.c (modified) (view diffs)
• arch/arm32/Makefile.inc (modified) (view diffs)
• arch/arm32/include/atomic.h (modified) (view diffs)
• arch/arm32/include/mm/as.h (modified) (view diffs)
• arch/arm32/include/mm/page.h (modified) (view diffs)
• arch/arm32/include/ras.h (added)
• arch/arm32/include/types.h (modified) (view diffs)
• arch/arm32/src/arm32.c (modified) (view diffs)
• arch/arm32/src/exc_handler.S (modified) (view diffs)
• arch/arm32/src/mm/as.c (modified) (view diffs)
• arch/arm32/src/ras.c (added)
• arch/arm32/src/userspace.c (modified) (view diffs)
• arch/ia32/Makefile.inc (modified) (view diffs)
• arch/ia32/include/cpu.h (modified) (view diffs)
• arch/ia32/include/cpuid.h (modified) (view diffs)
• arch/ia32/include/mm/page.h (modified) (view diffs)
• arch/ia32/include/types.h (modified) (view diffs)
• arch/ia32/src/boot/boot.S (modified) (view diffs)
• arch/ia32/src/cpu/cpu.c (modified) (view diffs)
• arch/ia32/src/ia32.c (modified) (view diffs)
• arch/ia32/src/interrupt.c (modified) (view diffs)
• arch/ia32/src/proc/scheduler.c (modified) (view diffs)
• arch/ia32/src/userspace.c (modified) (view diffs)
• arch/ia64/_link.ld.in (modified) (view diffs)
• arch/ia64/src/cpu/cpu.c (modified) (view diffs)
• arch/ia64/src/ivt.S (modified) (view diffs)
• arch/ia64/src/start.S (modified) (view diffs)
• arch/mips32/include/mm/page.h (modified) (view diffs)
• arch/mips32/include/types.h (modified) (view diffs)
• arch/ppc32/include/arg.h (deleted)
• arch/ppc32/include/mm/page.h (modified) (view diffs)
• arch/ppc32/include/types.h (modified) (view diffs)
• arch/ppc32/src/mm/as.c (modified) (view diffs)
• arch/ppc32/src/mm/tlb.c (modified) (view diffs)
• arch/ppc32/src/ppc32.c (modified) (view diffs)
• arch/sparc64/include/arg.h (deleted)
• arch/sparc64/src/context.S (modified) (view diffs)
• arch/sparc64/src/mm/tlb.c (modified) (view diffs)
• arch/sparc64/src/trap/trap_table.S (modified) (view diffs)
• genarch/Makefile.inc (modified) (view diffs)
• genarch/include/mm/as_pt.h (modified) (view diffs)
• genarch/include/mm/page_pt.h (modified) (view diffs)
• genarch/include/softint/multiplication.h (added)
• genarch/src/drivers/via-cuda/cuda.c (modified) (view diffs)
• genarch/src/fb/fb.c (modified) (view diffs)
• genarch/src/softint/multiplication.c (added)
• generic/include/arch.h (modified) (view diffs)
• generic/include/context.h (modified) (view diffs)
• generic/include/ipc/ipc.h (modified) (view diffs)
• generic/include/main/main.h (modified) (view diffs)
• generic/include/print.h (modified) (view diffs)
• generic/include/printf/printf_core.h (modified) (view diffs)
• generic/include/proc/task.h (modified) (view diffs)
• generic/include/proc/thread.h (modified) (view diffs)
• generic/include/stdarg.h (modified) (view diffs)
• generic/include/string.h (modified) (view diffs)
• generic/include/synch/futex.h (modified) (view diffs)
• generic/include/syscall/syscall.h (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/ipc/ipc.c (modified) (view diffs)
• generic/src/ipc/irq.c (modified) (view diffs)
• generic/src/ipc/kbox.c (modified) (view diffs)
• generic/src/ipc/sysipc.c (modified) (view diffs)
• generic/src/lib/elf.c (modified) (view diffs)
• generic/src/lib/string.c (modified) (view diffs)
• generic/src/main/main.c (modified) (view diffs)
• generic/src/mm/backend_phys.c (modified) (view diffs)
• generic/src/printf/printf_core.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/syscall/syscall.c (modified) (view diffs)
• generic/src/udebug/udebug_ops.c (modified) (view diffs)