← Back to branch summary

~jakub/helenos/upa

~jakub/helenos/upa

Viewing all changes in revision 665.

Committer: Jakub Jermar
Date: 2011-06-01 21:05:19 UTC
mfrom: (605.1.397 HelenOS.mainline)
Revision ID: jakub@jermar.eu-20110601210519-d511wino3zuw4o9j

Merge mainline changes.

files added:
kernel/arch/ppc32/include/mm/pht.h

kernel/arch/ppc32/src/mm/pht.c

uspace/app/tester/devs/devman2.c

uspace/app/tester/devs/devman2.def

uspace/app/tester/mm/common.c

uspace/app/tester/mm/common.h

uspace/app/tester/mm/malloc3.c

uspace/app/tester/mm/malloc3.def

uspace/drv/test3

uspace/drv/test3/Makefile

uspace/drv/test3/test3.c

uspace/drv/test3/test3.ma

uspace/lib/c/generic/adt/prodcons.c

uspace/lib/c/include/adt/prodcons.h

files removed:
contrib/conf/net-qe.bat

kernel/test/fpu

kernel/test/fpu/fpu1.def

kernel/test/fpu/fpu1_ia64.c

kernel/test/fpu/fpu1_skip.c

kernel/test/fpu/fpu1_x86.c

kernel/test/fpu/mips2.c

kernel/test/fpu/mips2.def

kernel/test/fpu/mips2_skip.c

kernel/test/fpu/sse1.c

kernel/test/fpu/sse1.def

kernel/test/fpu/sse1_skip.c

files renamed:
contrib/font/ => contrib/tools/font/

contrib/tools/download_and_patch_silo.sh => contrib/tools/serengeti_silo.sh

files modified:
HelenOS.config

boot/Makefile.build

boot/Makefile.common

boot/arch/ppc32/src/asm.S

contrib/conf/arm32-qe.sh

contrib/conf/ia32-qe.sh

contrib/conf/ppc32-qe.sh

defaults/ppc32/Makefile.config

kernel/Makefile

kernel/arch/abs32le/include/mm/as.h

kernel/arch/amd64/include/mm/as.h

kernel/arch/amd64/src/proc/scheduler.c

kernel/arch/amd64/src/userspace.c

kernel/arch/arm32/include/mm/as.h

kernel/arch/arm32/src/arm32.c

kernel/arch/arm32/src/userspace.c

kernel/arch/ia32/include/mm/as.h

kernel/arch/ia32/src/proc/scheduler.c

kernel/arch/ia32/src/userspace.c

kernel/arch/ia64/include/arch.h

kernel/arch/ia64/include/asm.h

kernel/arch/ia64/include/context.h

kernel/arch/ia64/include/mm/as.h

kernel/arch/ia64/include/mm/frame.h

kernel/arch/ia64/include/register.h

kernel/arch/ia64/src/ia64.c

kernel/arch/ia64/src/ivt.S

kernel/arch/ia64/src/mm/tlb.c

kernel/arch/ia64/src/proc/scheduler.c

kernel/arch/mips32/include/mm/as.h

kernel/arch/mips32/src/debugger.c

kernel/arch/mips32/src/mips32.c

kernel/arch/mips32/src/mm/tlb.c

kernel/arch/ppc32/Makefile.inc

kernel/arch/ppc32/include/boot/boot.h

kernel/arch/ppc32/include/interrupt.h

kernel/arch/ppc32/include/istate.h

kernel/arch/ppc32/include/mm/as.h

kernel/arch/ppc32/include/mm/tlb.h

kernel/arch/ppc32/src/boot/boot.S

kernel/arch/ppc32/src/exception.S

kernel/arch/ppc32/src/interrupt.c

kernel/arch/ppc32/src/mm/page.c

kernel/arch/ppc32/src/mm/tlb.c

kernel/arch/ppc32/src/ppc32.c

kernel/arch/ppc32/src/proc/scheduler.c

kernel/arch/sparc64/Makefile.inc

kernel/arch/sparc64/include/mm/sun4u/as.h

kernel/arch/sparc64/include/mm/sun4v/as.h

kernel/arch/sparc64/src/mm/sun4u/as.c

kernel/arch/sparc64/src/mm/sun4u/tlb.c

kernel/arch/sparc64/src/mm/sun4v/as.c

kernel/arch/sparc64/src/mm/sun4v/tlb.c

kernel/genarch/include/mm/page_pt.h

kernel/genarch/src/drivers/ega/ega.c

kernel/genarch/src/mm/page_ht.c

kernel/genarch/src/mm/page_pt.c

kernel/generic/include/adt/list.h

kernel/generic/include/arch.h

kernel/generic/include/config.h

kernel/generic/include/cpu.h

kernel/generic/include/ipc/event.h

kernel/generic/include/ipc/event_types.h

kernel/generic/include/mm/as.h

kernel/generic/include/mm/frame.h

kernel/generic/include/mm/page.h

kernel/generic/include/mm/reserve.h

kernel/generic/include/mm/tlb.h

kernel/generic/include/proc/task.h

kernel/generic/include/proc/thread.h

kernel/generic/include/proc/uarg.h

kernel/generic/include/synch/waitq.h

kernel/generic/include/syscall/syscall.h

kernel/generic/include/typedefs.h

kernel/generic/src/adt/list.c

kernel/generic/src/console/cmd.c

kernel/generic/src/console/console.c

kernel/generic/src/ddi/ddi.c

kernel/generic/src/debug/panic.c

kernel/generic/src/interrupt/interrupt.c

kernel/generic/src/ipc/event.c

kernel/generic/src/lib/elf.c

kernel/generic/src/lib/memfnc.c

kernel/generic/src/main/main.c

kernel/generic/src/main/uinit.c

kernel/generic/src/mm/as.c

kernel/generic/src/mm/backend_anon.c

kernel/generic/src/mm/backend_elf.c

kernel/generic/src/mm/frame.c

kernel/generic/src/mm/page.c

kernel/generic/src/mm/reserve.c

kernel/generic/src/printf/vprintf.c

kernel/generic/src/proc/program.c

kernel/generic/src/proc/scheduler.c

kernel/generic/src/proc/task.c

kernel/generic/src/proc/the.c

kernel/generic/src/proc/thread.c

kernel/generic/src/security/cap.c

kernel/generic/src/synch/futex.c

kernel/generic/src/synch/spinlock.c

kernel/generic/src/syscall/syscall.c

kernel/test/mm/mapping1.c

kernel/test/test.c

kernel/test/test.h

tools/toolchain.sh

uspace/Makefile

uspace/Makefile.common

uspace/app/klog/klog.c

uspace/app/tester/Makefile

uspace/app/tester/mm/malloc1.c

uspace/app/tester/tester.c

uspace/app/tester/tester.h

uspace/drv/rootvirt/devices.def

uspace/lib/c/Makefile

uspace/lib/c/arch/ppc32/_link.ld.in

uspace/lib/c/generic/as.c

uspace/lib/c/generic/assert.c

uspace/lib/c/generic/event.c

uspace/lib/c/generic/io/klog.c

uspace/lib/c/generic/io/vprintf.c

uspace/lib/c/generic/malloc.c

uspace/lib/c/generic/thread.c

uspace/lib/c/include/adt/fifo.h

uspace/lib/c/include/adt/list.h

uspace/lib/c/include/adt/measured_strings.h

uspace/lib/c/include/as.h

uspace/lib/c/include/event.h

uspace/lib/c/include/fibril.h

uspace/lib/c/include/io/klog.h

uspace/lib/c/include/malloc.h

uspace/lib/net/il/ip_client.c

uspace/lib/net/include/ip_header.h

uspace/srv/net/il/ip/ip.c

uspace/srv/net/tl/tcp/tcp.c

uspace/srv/net/tl/tcp/tcp_header.h

uspace/srv/vfs/vfs.h

uspace/srv/vfs/vfs_file.c

uspace/srv/vfs/vfs_ops.c

Show diffs side-by-side

added added

removed removed

boot/Makefile.build

boot/Makefile.common

boot/arch/ppc32/src/asm.S

contrib/conf/arm32-qe.sh

contrib/conf/ia32-qe.sh

contrib/conf/net-qe.bat

contrib/conf/ppc32-qe.sh

defaults/ppc32/Makefile.config

kernel/Makefile

kernel/arch/abs32le/include/mm/as.h

kernel/arch/amd64/include/mm/as.h

kernel/arch/amd64/src/proc/scheduler.c

kernel/arch/amd64/src/userspace.c

kernel/arch/arm32/include/mm/as.h

kernel/arch/arm32/src/arm32.c

kernel/arch/arm32/src/userspace.c

kernel/arch/ia32/include/mm/as.h

kernel/arch/ia32/src/proc/scheduler.c

kernel/arch/ia32/src/userspace.c

kernel/arch/ia64/include/arch.h

kernel/arch/ia64/include/asm.h

kernel/arch/ia64/include/context.h

kernel/arch/ia64/include/mm/as.h

kernel/arch/ia64/include/mm/frame.h

kernel/arch/ia64/include/register.h

kernel/arch/ia64/src/ia64.c

kernel/arch/ia64/src/ivt.S

kernel/arch/ia64/src/mm/tlb.c

kernel/arch/ia64/src/proc/scheduler.c

kernel/arch/mips32/include/mm/as.h

kernel/arch/mips32/src/debugger.c

kernel/arch/mips32/src/mips32.c

kernel/arch/mips32/src/mm/tlb.c

kernel/arch/ppc32/Makefile.inc

kernel/arch/ppc32/include/boot/boot.h

kernel/arch/ppc32/include/interrupt.h

kernel/arch/ppc32/include/istate.h

kernel/arch/ppc32/include/mm/as.h

kernel/arch/ppc32/include/mm/pht.h

kernel/arch/ppc32/include/mm/tlb.h

kernel/arch/ppc32/src/boot/boot.S

kernel/arch/ppc32/src/exception.S

kernel/arch/ppc32/src/interrupt.c

kernel/arch/ppc32/src/mm/page.c

kernel/arch/ppc32/src/mm/pht.c

kernel/arch/ppc32/src/mm/tlb.c

kernel/arch/ppc32/src/ppc32.c

kernel/arch/ppc32/src/proc/scheduler.c

kernel/arch/sparc64/Makefile.inc

kernel/arch/sparc64/include/mm/sun4u/as.h

kernel/arch/sparc64/include/mm/sun4v/as.h

kernel/arch/sparc64/src/mm/sun4u/as.c

kernel/arch/sparc64/src/mm/sun4u/tlb.c

kernel/arch/sparc64/src/mm/sun4v/as.c

kernel/arch/sparc64/src/mm/sun4v/tlb.c

kernel/genarch/include/mm/page_pt.h

kernel/genarch/src/drivers/ega/ega.c

kernel/genarch/src/mm/page_ht.c

kernel/genarch/src/mm/page_pt.c

kernel/generic/include/adt/list.h

kernel/generic/include/arch.h

kernel/generic/include/config.h

kernel/generic/include/cpu.h

kernel/generic/include/ipc/event.h

kernel/generic/include/ipc/event_types.h

kernel/generic/include/mm/as.h

kernel/generic/include/mm/frame.h

kernel/generic/include/mm/page.h

kernel/generic/include/mm/reserve.h

kernel/generic/include/mm/tlb.h

kernel/generic/include/proc/task.h

kernel/generic/include/proc/thread.h

kernel/generic/include/proc/uarg.h

kernel/generic/include/synch/waitq.h

kernel/generic/include/syscall/syscall.h

kernel/generic/include/typedefs.h

kernel/generic/src/adt/list.c

kernel/generic/src/console/cmd.c

kernel/generic/src/console/console.c

kernel/generic/src/ddi/ddi.c

kernel/generic/src/debug/panic.c

kernel/generic/src/interrupt/interrupt.c

kernel/generic/src/ipc/event.c

kernel/generic/src/lib/elf.c

kernel/generic/src/lib/memfnc.c

kernel/generic/src/main/main.c

kernel/generic/src/main/uinit.c

kernel/generic/src/mm/as.c

kernel/generic/src/mm/backend_anon.c

kernel/generic/src/mm/backend_elf.c

kernel/generic/src/mm/frame.c

kernel/generic/src/mm/page.c

kernel/generic/src/mm/reserve.c

kernel/generic/src/printf/vprintf.c

kernel/generic/src/proc/program.c

kernel/generic/src/proc/scheduler.c

kernel/generic/src/proc/task.c

kernel/generic/src/proc/the.c

kernel/generic/src/proc/thread.c

kernel/generic/src/security/cap.c

kernel/generic/src/synch/futex.c

kernel/generic/src/synch/spinlock.c

kernel/generic/src/syscall/syscall.c

kernel/test/fpu/

kernel/test/fpu/fpu1.def

kernel/test/fpu/fpu1_ia64.c

kernel/test/fpu/fpu1_skip.c

kernel/test/fpu/fpu1_x86.c

kernel/test/fpu/mips2.c

kernel/test/fpu/mips2.def

kernel/test/fpu/mips2_skip.c

kernel/test/fpu/sse1.c

kernel/test/fpu/sse1.def

kernel/test/fpu/sse1_skip.c

kernel/test/mm/mapping1.c

kernel/test/test.c

kernel/test/test.h

tools/toolchain.sh

uspace/Makefile

uspace/Makefile.common

uspace/app/klog/klog.c

uspace/app/tester/Makefile

uspace/app/tester/devs/devman2.c

uspace/app/tester/devs/devman2.def

uspace/app/tester/mm/common.c

uspace/app/tester/mm/common.h

uspace/app/tester/mm/malloc1.c

uspace/app/tester/mm/malloc3.c

uspace/app/tester/mm/malloc3.def

uspace/app/tester/tester.c

uspace/app/tester/tester.h

uspace/drv/rootvirt/devices.def

uspace/drv/test3/

uspace/drv/test3/Makefile

uspace/drv/test3/test3.c

uspace/drv/test3/test3.ma

uspace/lib/c/Makefile

uspace/lib/c/arch/ppc32/_link.ld.in

uspace/lib/c/generic/adt/prodcons.c

uspace/lib/c/generic/as.c

uspace/lib/c/generic/assert.c

uspace/lib/c/generic/event.c

uspace/lib/c/generic/io/klog.c

uspace/lib/c/generic/io/vprintf.c

uspace/lib/c/generic/malloc.c

uspace/lib/c/generic/thread.c

uspace/lib/c/include/adt/fifo.h

uspace/lib/c/include/adt/list.h

uspace/lib/c/include/adt/measured_strings.h

uspace/lib/c/include/adt/prodcons.h

uspace/lib/c/include/as.h

uspace/lib/c/include/event.h

uspace/lib/c/include/fibril.h

uspace/lib/c/include/io/klog.h

uspace/lib/c/include/malloc.h

uspace/lib/net/il/ip_client.c

uspace/lib/net/include/ip_header.h

uspace/srv/net/il/ip/ip.c

uspace/srv/net/tl/tcp/tcp.c

uspace/srv/net/tl/tcp/tcp_header.h

uspace/srv/vfs/vfs.h

uspace/srv/vfs/vfs_file.c

uspace/srv/vfs/vfs_ops.c

Older »