Changeset 387416b in mainline

Timestamp:

2009-12-12T10:11:35Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

99de22b

Parents:

58d5803d (diff), 1e4cada (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:

Synchronizing with head.

Files:

• Makefile (modified) (view diffs)
• boot/Makefile.common (added)
• boot/arch/amd64/Makefile.inc (modified) (view diffs)
• boot/arch/amd64/grub/menu.lst (deleted)
• boot/arch/arm32/loader/Makefile.build (modified) (view diffs)
• boot/arch/arm32/loader/Makefile.common (modified) (view diffs)
• boot/arch/ia64/loader/Makefile.build (modified) (view diffs)
• boot/arch/ia64/loader/Makefile.common (modified) (view diffs)
• boot/arch/mips32/loader/Makefile.build (modified) (view diffs)
• boot/arch/mips32/loader/Makefile.common (modified) (view diffs)
• boot/arch/ppc32/Makefile.inc (modified) (view diffs)
• boot/arch/ppc32/loader/Makefile.build (modified) (view diffs)
• boot/arch/ppc32/loader/Makefile.common (modified) (view diffs)
• boot/arch/sparc64/Makefile.inc (modified) (view diffs)
• boot/arch/sparc64/loader/Makefile.build (modified) (view diffs)
• boot/arch/sparc64/loader/Makefile.common (modified) (view diffs)
• kernel/arch/amd64/src/amd64.c (modified) (view diffs)
• kernel/arch/arm32/Makefile.inc (modified) (view diffs)
• kernel/arch/arm32/include/atomic.h (modified) (view diffs)
• kernel/arch/arm32/include/mm/as.h (modified) (view diffs)
• kernel/arch/arm32/include/ras.h (added)
• kernel/arch/arm32/src/arm32.c (modified) (view diffs)
• kernel/arch/arm32/src/exc_handler.S (modified) (view diffs)
• kernel/arch/arm32/src/mm/as.c (modified) (view diffs)
• kernel/arch/arm32/src/ras.c (added)
• kernel/arch/arm32/src/userspace.c (modified) (view diffs)
• kernel/arch/ia32/src/ia32.c (modified) (view diffs)
• kernel/arch/ia64/src/cpu/cpu.c (modified) (view diffs)
• kernel/arch/ppc32/src/mm/as.c (modified) (view diffs)
• kernel/arch/ppc32/src/mm/tlb.c (modified) (view diffs)
• kernel/arch/ppc32/src/ppc32.c (modified) (view diffs)
• kernel/arch/sparc64/src/drivers/kbd.c (modified) (view diffs)
• kernel/arch/sparc64/src/mm/page.c (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4u/tlb.c (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4v/tlb.c (modified) (view diffs)
• kernel/genarch/src/drivers/via-cuda/cuda.c (modified) (view diffs)
• kernel/genarch/src/fb/fb.c (modified) (view diffs)
• kernel/generic/include/arch.h (modified) (view diffs)
• kernel/generic/include/proc/task.h (modified) (view diffs)
• kernel/generic/include/proc/thread.h (modified) (view diffs)
• kernel/generic/include/string.h (modified) (view diffs)
• kernel/generic/include/synch/futex.h (modified) (view diffs)
• kernel/generic/include/syscall/syscall.h (modified) (view diffs)
• kernel/generic/src/console/kconsole.c (modified) (view diffs)
• kernel/generic/src/lib/string.c (modified) (view diffs)
• kernel/generic/src/mm/backend_phys.c (modified) (view diffs)
• kernel/generic/src/proc/task.c (modified) (view diffs)
• kernel/generic/src/proc/thread.c (modified) (view diffs)
• kernel/generic/src/synch/futex.c (modified) (view diffs)
• kernel/generic/src/syscall/syscall.c (modified) (view diffs)
• kernel/generic/src/udebug/udebug_ops.c (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/app/bdsh/input.c (modified) (view diffs)
• uspace/app/bdsh/input.h (modified) (view diffs)
• uspace/app/bdsh/scli.c (modified) (view diffs)
• uspace/app/edit/edit.c (modified) (view diffs)
• uspace/app/init/init.c (modified) (view diffs)
• uspace/app/trace/trace.c (modified) (view diffs)
• uspace/lib/libblock/libblock.c (modified) (view diffs)
• uspace/lib/libblock/libblock.h (modified) (view diffs)
• uspace/lib/libc/Makefile.build (modified) (view diffs)
• uspace/lib/libc/arch/amd64/include/atomic.h (modified) (view diffs)
• uspace/lib/libc/arch/arm32/include/atomic.h (modified) (view diffs)
• uspace/lib/libc/arch/arm32/src/entry.s (modified) (view diffs)
• uspace/lib/libc/arch/arm32/src/syscall.c (modified) (view diffs)
• uspace/lib/libc/arch/ia32/Makefile.inc (modified) (view diffs)
• uspace/lib/libc/arch/ia32/include/atomic.h (modified) (view diffs)
• uspace/lib/libc/arch/ia64/include/atomic.h (modified) (view diffs)
• uspace/lib/libc/arch/mips32/include/atomic.h (modified) (view diffs)
• uspace/lib/libc/arch/ppc32/include/atomic.h (modified) (view diffs)
• uspace/lib/libc/arch/sparc64/include/atomic.h (modified) (view diffs)
• uspace/lib/libc/generic/clipboard.c (added)
• uspace/lib/libc/generic/fibril_synch.c (moved) (moved from uspace/lib/libc/generic/fibril_sync.c ) (view diffs)
• uspace/lib/libc/generic/futex.c (modified) (view diffs)
• uspace/lib/libc/generic/io/console.c (modified) (view diffs)
• uspace/lib/libc/generic/io/io.c (modified) (view diffs)
• uspace/lib/libc/generic/string.c (modified) (view diffs)
• uspace/lib/libc/generic/time.c (modified) (view diffs)
• uspace/lib/libc/include/atomic.h (modified) (view diffs)
• uspace/lib/libc/include/atomicdflt.h (added)
• uspace/lib/libc/include/clipboard.h (added)
• uspace/lib/libc/include/fibril_synch.h (moved) (moved from uspace/lib/libc/include/fibril_sync.h ) (view diffs)
• uspace/lib/libc/include/futex.h (modified) (view diffs)
• uspace/lib/libc/include/io/console.h (modified) (view diffs)
• uspace/lib/libc/include/ipc/clipboard.h (added)
• uspace/lib/libc/include/ipc/console.h (modified) (view diffs)
• uspace/lib/libc/include/ipc/services.h (modified) (view diffs)
• uspace/lib/libc/include/string.h (modified) (view diffs)
• uspace/lib/libc/include/unistd.h (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_bd.h (modified) (view diffs)
• uspace/srv/bd/file_bd/file_bd.c (modified) (view diffs)
• uspace/srv/bd/gxe_bd/gxe_bd.c (modified) (view diffs)
• uspace/srv/bd/rd/rd.c (modified) (view diffs)
• uspace/srv/clip/Makefile (added)
• uspace/srv/clip/Makefile.build (added)
• uspace/srv/clip/Makefile.common (added)
• uspace/srv/clip/clip.c (added)
• uspace/srv/clip/clip.h (added)
• uspace/srv/console/console.c (modified) (view diffs)
• uspace/srv/devmap/devmap.c (modified) (view diffs)
• uspace/srv/fs/devfs/devfs_ops.c (modified) (view diffs)
• uspace/srv/fs/fat/fat.h (modified) (view diffs)
• uspace/srv/fs/fat/fat_fat.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_idx.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_ops.c (modified) (view diffs)
• uspace/srv/loader/arch/arm32/arm32.s (modified) (view diffs)
• uspace/srv/part/mbr_part/mbr_part.c (modified) (view diffs)
• uspace/srv/vfs/vfs.h (modified) (view diffs)
• uspace/srv/vfs/vfs_file.c (modified) (view diffs)
• uspace/srv/vfs/vfs_lookup.c (modified) (view diffs)
• uspace/srv/vfs/vfs_node.c (modified) (view diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (view diffs)
• uspace/srv/vfs/vfs_register.c (modified) (view diffs)