Changeset 04803bf in mainline for kernel/generic

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

Location:

kernel/generic

Files:

• include/adt/avl.h (modified) (view diffs)
• include/adt/bitmap.h (modified) (view diffs)
• include/adt/btree.h (modified) (view diffs)
• include/adt/hash_table.h (modified) (view diffs)
• include/adt/list.h (modified) (view diffs)
• include/arch.h (modified) (view diffs)
• include/atomic.h (modified) (view diffs)
• include/bitops.h (modified) (view diffs)
• include/byteorder.h (modified) (view diffs)
• include/config.h (modified) (view diffs)
• include/console/chardev.h (modified) (view diffs)
• include/console/console.h (modified) (view diffs)
• include/console/kconsole.h (modified) (view diffs)
• include/context.h (modified) (view diffs)
• include/cpu.h (modified) (view diffs)
• include/ddi/ddi.h (modified) (view diffs)
• include/ddi/ddi_arg.h (modified) (view diffs)
• include/ddi/device.h (modified) (view diffs)
• include/ddi/irq.h (modified) (view diffs)
• include/debug.h (modified) (view diffs)
• include/func.h (modified) (view diffs)
• include/interrupt.h (modified) (view diffs)
• include/ipc/event.h (modified) (view diffs)
• include/ipc/event_types.h (modified) (view diffs)
• include/ipc/ipc.h (modified) (view diffs)
• include/ipc/ipcrsc.h (modified) (view diffs)
• include/ipc/irq.h (modified) (view diffs)
• include/ipc/sysipc.h (modified) (view diffs)
• include/lib/elf.h (modified) (view diffs)
• include/lib/rd.h (modified) (view diffs)
• include/macros.h (modified) (view diffs)
• include/main/main.h (modified) (view diffs)
• include/main/uinit.h (modified) (view diffs)
• include/main/version.h (modified) (view diffs)
• include/memstr.h (modified) (view diffs)
• include/mm/as.h (modified) (view diffs)
• include/mm/buddy.h (modified) (view diffs)
• include/mm/frame.h (modified) (view diffs)
• include/mm/page.h (modified) (view diffs)
• include/mm/slab.h (modified) (view diffs)
• include/mm/tlb.h (modified) (view diffs)
• include/panic.h (modified) (view diffs)
• include/preemption.h (modified) (view diffs)
• include/print.h (modified) (view diffs)
• include/printf/printf_core.h (modified) (view diffs)
• include/proc/program.h (modified) (view diffs)
• include/proc/scheduler.h (modified) (view diffs)
• include/proc/task.h (modified) (view diffs)
• include/proc/thread.h (modified) (view diffs)
• include/security/cap.h (modified) (view diffs)
• include/smp/ipi.h (modified) (view diffs)
• include/smp/smp.h (modified) (view diffs)
• include/sort.h (modified) (view diffs)
• include/stacktrace.h (added)
• include/stdarg.h (modified) (view diffs)
• include/stdint.h (added)
• include/str.h (moved) (moved from kernel/generic/include/string.h ) (view diffs)
• include/symtab.h (modified) (view diffs)
• include/synch/condvar.h (modified) (view diffs)
• include/synch/futex.h (modified) (view diffs)
• include/synch/mutex.h (modified) (view diffs)
• include/synch/semaphore.h (modified) (view diffs)
• include/synch/smc.h (modified) (view diffs)
• include/synch/spinlock.h (modified) (view diffs)
• include/synch/waitq.h (modified) (view diffs)
• include/syscall/copy.h (modified) (view diffs)
• include/syscall/syscall.h (modified) (view diffs)
• include/sysinfo/abi.h (added)
• include/sysinfo/stats.h (added)
• include/sysinfo/sysinfo.h (modified) (view diffs)
• include/time/clock.h (modified) (view diffs)
• include/time/delay.h (modified) (view diffs)
• include/time/timeout.h (modified) (view diffs)
• include/trace.h (added)
• include/typedefs.h (modified) (view diffs)
• include/udebug/udebug.h (modified) (view diffs)
• include/udebug/udebug_ipc.h (modified) (view diffs)
• include/udebug/udebug_ops.h (modified) (view diffs)
• include/userspace.h (modified) (view diffs)
• include/verify.h (added)
• src/adt/avl.c (modified) (view diffs)
• src/adt/bitmap.c (modified) (view diffs)
• src/adt/btree.c (modified) (view diffs)
• src/adt/hash_table.c (modified) (view diffs)
• src/console/chardev.c (modified) (view diffs)
• src/console/cmd.c (modified) (view diffs)
• src/console/console.c (modified) (view diffs)
• src/console/kconsole.c (modified) (view diffs)
• src/cpu/cpu.c (modified) (view diffs)
• src/ddi/ddi.c (modified) (view diffs)
• src/ddi/device.c (modified) (view diffs)
• src/ddi/irq.c (modified) (view diffs)
• src/debug/debug.c (moved) (moved from kernel/test/synch/rwlock2.c ) (view diffs)
• src/debug/panic.c (added)
• src/debug/stacktrace.c (added)
• src/debug/symtab.c (modified) (view diffs)
• src/interrupt/interrupt.c (modified) (view diffs)
• src/ipc/event.c (modified) (view diffs)
• src/ipc/ipc.c (modified) (view diffs)
• src/ipc/ipcrsc.c (modified) (view diffs)
• src/ipc/irq.c (modified) (view diffs)
• src/ipc/kbox.c (modified) (view diffs)
• src/ipc/sysipc.c (modified) (view diffs)
• src/lib/elf.c (modified) (view diffs)
• src/lib/func.c (modified) (view diffs)
• src/lib/memstr.c (modified) (view diffs)
• src/lib/rd.c (modified) (view diffs)
• src/lib/sort.c (modified) (view diffs)
• src/lib/str.c (moved) (moved from kernel/generic/src/lib/string.c ) (view diffs)
• src/main/kinit.c (modified) (view diffs)
• src/main/main.c (modified) (view diffs)
• src/main/uinit.c (modified) (view diffs)
• src/main/version.c (modified) (view diffs)
• src/mm/as.c (modified) (view diffs)
• src/mm/backend_anon.c (modified) (view diffs)
• src/mm/backend_elf.c (modified) (view diffs)
• src/mm/backend_phys.c (modified) (view diffs)
• src/mm/buddy.c (modified) (view diffs)
• src/mm/frame.c (modified) (view diffs)
• src/mm/page.c (modified) (view diffs)
• src/mm/slab.c (modified) (view diffs)
• src/mm/tlb.c (modified) (view diffs)
• src/preempt/preemption.c (modified) (view diffs)
• src/printf/printf.c (modified) (view diffs)
• src/printf/printf_core.c (modified) (view diffs)
• src/printf/vprintf.c (modified) (view diffs)
• src/printf/vsnprintf.c (modified) (view diffs)
• src/proc/program.c (modified) (view diffs)
• src/proc/scheduler.c (modified) (view diffs)
• src/proc/task.c (modified) (view diffs)
• src/proc/the.c (modified) (view diffs)
• src/proc/thread.c (modified) (view diffs)
• src/security/cap.c (modified) (view diffs)
• src/smp/ipi.c (modified) (view diffs)
• src/synch/futex.c (modified) (view diffs)
• src/synch/mutex.c (modified) (view diffs)
• src/synch/rwlock.c (deleted)
• src/synch/semaphore.c (modified) (view diffs)
• src/synch/smc.c (modified) (view diffs)
• src/synch/spinlock.c (modified) (view diffs)
• src/synch/waitq.c (modified) (view diffs)
• src/syscall/copy.c (modified) (view diffs)
• src/syscall/syscall.c (modified) (view diffs)
• src/sysinfo/stats.c (added)
• src/sysinfo/sysinfo.c (modified) (view diffs)
• src/time/clock.c (modified) (view diffs)
• src/time/delay.c (modified) (view diffs)
• src/time/timeout.c (modified) (view diffs)
• src/udebug/udebug.c (modified) (view diffs)
• src/udebug/udebug_ipc.c (modified) (view diffs)
• src/udebug/udebug_ops.c (modified) (view diffs)