Changeset bee37cf in mainline for kernel

Timestamp:

2011-07-05T21:21:36Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5e2aa83, eb66f236

Parents:

3714e79 (diff), f7a55f9 (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:

• arch/amd64/Makefile.inc (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/src/boot/vesa_real.inc (modified) (view diffs)
• arch/ia64/src/drivers/ski.c (modified) (view diffs)
• arch/mips32/Makefile.inc (modified) (view diffs)
• arch/mips32/include/cycle.h (modified) (view diffs)
• arch/mips32/include/debug.h (modified) (view diffs)
• arch/mips32/include/mm/frame.h (modified) (view diffs)
• arch/mips32/include/stack.h (modified) (view diffs)
• arch/mips32/src/cache.c (modified) (view diffs)
• arch/mips32/src/cpu/cpu.c (modified) (view diffs)
• arch/mips32/src/fpu_context.c (modified) (view diffs)
• arch/mips32/src/mm/as.c (modified) (view diffs)
• arch/mips32/src/mm/tlb.c (modified) (view diffs)
• arch/mips32/src/start.S (modified) (view diffs)
• arch/mips64/Makefile.inc (added)
• arch/mips64/_link.ld.in (added)
• arch/mips64/include/arch.h (added)
• arch/mips64/include/asm.h (added)
• arch/mips64/include/asm/boot.h (added)
• arch/mips64/include/asm/regname.h (added)
• arch/mips64/include/atomic.h (added)
• arch/mips64/include/barrier.h (added)
• arch/mips64/include/cache.h (added)
• arch/mips64/include/context.h (added)
• arch/mips64/include/context_offset.h (added)
• arch/mips64/include/cp0.h (added)
• arch/mips64/include/cpu.h (moved) (moved from uspace/srv/hid/adb_mouse/adb_mouse.h ) (view diffs)
• arch/mips64/include/cycle.h (added)
• arch/mips64/include/debug.h (added)
• arch/mips64/include/debugger.h (added)
• arch/mips64/include/drivers/msim.h (added)
• arch/mips64/include/elf.h (added)
• arch/mips64/include/exception.h (added)
• arch/mips64/include/faddr.h (added)
• arch/mips64/include/fpu_context.h (added)
• arch/mips64/include/interrupt.h (moved) (moved from kernel/arch/sparc64/include/drivers/fhc.h ) (view diffs)
• arch/mips64/include/istate.h (added)
• arch/mips64/include/mm/as.h (added)
• arch/mips64/include/mm/asid.h (added)
• arch/mips64/include/mm/frame.h (added)
• arch/mips64/include/mm/page.h (added)
• arch/mips64/include/mm/tlb.h (added)
• arch/mips64/include/proc/task.h (added)
• arch/mips64/include/proc/thread.h (added)
• arch/mips64/include/smp/dorder.h (added)
• arch/mips64/include/stack.h (added)
• arch/mips64/include/types.h (moved) (moved from uspace/lib/c/include/async_sess.h ) (view diffs)
• arch/mips64/src/asm.S (added)
• arch/mips64/src/cache.c (added)
• arch/mips64/src/context.S (added)
• arch/mips64/src/cpu (added)
• arch/mips64/src/ddi (added)
• arch/mips64/src/debug (added)
• arch/mips64/src/debugger.c (added)
• arch/mips64/src/exception.c (added)
• arch/mips64/src/fpu_context.c (added)
• arch/mips64/src/interrupt.c (added)
• arch/mips64/src/mips64.c (added)
• arch/mips64/src/mm/as.c (added)
• arch/mips64/src/mm/frame.c (added)
• arch/mips64/src/mm/page.c (added)
• arch/mips64/src/mm/tlb.c (added)
• arch/mips64/src/smp/dorder.c (added)
• arch/mips64/src/smp/smp.c (added)
• arch/mips64/src/start.S (added)
• arch/sparc64/Makefile.inc (modified) (view diffs)
• arch/sparc64/include/drivers/sgcn.h (deleted)
• arch/sparc64/src/console.c (modified) (view diffs)
• arch/sparc64/src/drivers/fhc.c (deleted)
• arch/sparc64/src/drivers/kbd.c (modified) (view diffs)
• arch/sparc64/src/drivers/niagara.c (modified) (view diffs)
• arch/sparc64/src/drivers/sgcn.c (deleted)
• arch/sparc64/src/drivers/tick.c (modified) (view diffs)
• genarch/Makefile.inc (modified) (view diffs)
• genarch/include/drivers/s3c24xx_uart/s3c24xx_uart.h (modified) (view diffs)
• genarch/include/drivers/z8530/z8530.h (deleted)
• genarch/include/ofw/fhc.h (deleted)
• genarch/src/drivers/dsrln/dsrlnout.c (modified) (view diffs)
• genarch/src/drivers/ega/ega.c (modified) (view diffs)
• genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• genarch/src/drivers/z8530/z8530.c (deleted)
• genarch/src/fb/fb.c (modified) (view diffs)
• genarch/src/mm/asid.c (modified) (view diffs)
• genarch/src/ofw/fhc.c (deleted)
• generic/include/adt/btree.h (modified) (view diffs)
• generic/include/adt/hash_table.h (modified) (view diffs)
• generic/include/adt/list.h (modified) (view diffs)
• generic/include/console/chardev.h (modified) (view diffs)
• generic/include/console/console.h (modified) (view diffs)
• generic/include/console/kconsole.h (modified) (view diffs)
• generic/include/cpu.h (modified) (view diffs)
• generic/include/ddi/ddi.h (modified) (view diffs)
• generic/include/ddi/irq.h (modified) (view diffs)
• generic/include/ipc/ipc.h (modified) (view diffs)
• generic/include/ipc/ipc_methods.h (added)
• generic/include/mm/as.h (modified) (view diffs)
• generic/include/mm/buddy.h (modified) (view diffs)
• generic/include/mm/page.h (modified) (view diffs)
• generic/include/mm/slab.h (modified) (view diffs)
• generic/include/panic.h (modified) (view diffs)
• generic/include/proc/scheduler.h (modified) (view diffs)
• generic/include/proc/task.h (modified) (view diffs)
• generic/include/proc/thread.h (modified) (view diffs)
• generic/include/synch/waitq.h (modified) (view diffs)
• generic/include/syscall/syscall.h (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/ddi/irq.c (modified) (view diffs)
• generic/src/debug/panic.c (modified) (view diffs)
• generic/src/ipc/ipc.c (modified) (view diffs)
• generic/src/ipc/ipcrsc.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/rd.c (modified) (view diffs)
• generic/src/main/version.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 (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/synch/waitq.c (modified) (view diffs)
• generic/src/syscall/syscall.c (modified) (view diffs)
• generic/src/sysinfo/stats.c (modified) (view diffs)
• generic/src/time/clock.c (modified) (view diffs)
• generic/src/time/delay.c (modified) (view diffs)
• generic/src/time/timeout.c (modified) (view diffs)
• generic/src/udebug/udebug.c (modified) (view diffs)
• generic/src/udebug/udebug_ops.c (modified) (view diffs)