Changeset b5e68c8 in mainline for kernel

Timestamp:

2011-05-12T16:49:44Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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)
• arch/abs32le/include/istate.h (modified) (view diffs)
• arch/abs32le/include/memstr.h (deleted)
• arch/abs32le/include/mm/as.h (modified) (view diffs)
• arch/abs32le/include/mm/page.h (modified) (view diffs)
• arch/abs32le/include/types.h (modified) (view diffs)
• arch/abs32le/src/abs32le.c (modified) (view diffs)
• arch/amd64/Makefile.inc (modified) (view diffs)
• arch/amd64/_link.ld.in (modified) (view diffs)
• arch/amd64/include/asm.h (modified) (view diffs)
• arch/amd64/include/context.h (modified) (view diffs)
• arch/amd64/include/context_offset.h (modified) (view diffs)
• arch/amd64/include/cpu.h (modified) (view diffs)
• arch/amd64/include/debugger.h (modified) (view diffs)
• arch/amd64/include/interrupt.h (modified) (view diffs)
• arch/amd64/include/istate.h (modified) (view diffs)
• arch/amd64/include/mm/as.h (modified) (view diffs)
• arch/amd64/include/mm/page.h (modified) (view diffs)
• arch/amd64/include/pm.h (modified) (view diffs)
• arch/amd64/include/proc/thread.h (modified) (view diffs)
• arch/amd64/include/types.h (modified) (view diffs)
• arch/amd64/src/amd64.c (modified) (view diffs)
• arch/amd64/src/asm.S (modified) (view diffs)
• arch/amd64/src/boot/memmap.c (modified) (view diffs)
• arch/amd64/src/cpu/cpu.c (modified) (view diffs)
• arch/amd64/src/ddi/ddi.c (modified) (view diffs)
• arch/amd64/src/debugger.c (modified) (view diffs)
• arch/amd64/src/interrupt.c (modified) (view diffs)
• arch/amd64/src/mm/page.c (modified) (view diffs)
• arch/amd64/src/pm.c (modified) (view diffs)
• arch/arm32/include/mach/integratorcp/integratorcp.h (modified) (view diffs)
• arch/arm32/include/mach/testarm/testarm.h (modified) (view diffs)
• arch/arm32/include/machine_func.h (modified) (view diffs)
• arch/arm32/include/types.h (modified) (view diffs)
• arch/arm32/src/asm.S (modified) (view diffs)
• arch/arm32/src/exception.c (modified) (view diffs)
• arch/arm32/src/mach/gta02/gta02.c (modified) (view diffs)
• arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (view diffs)
• arch/arm32/src/mach/testarm/testarm.c (modified) (view diffs)
• arch/arm32/src/mm/page.c (modified) (view diffs)
• arch/arm32/src/mm/page_fault.c (modified) (view diffs)
• arch/ia32/_link.ld.in (modified) (view diffs)
• arch/ia32/include/asm.h (modified) (view diffs)
• arch/ia32/include/barrier.h (modified) (view diffs)
• arch/ia32/include/boot/boot.h (modified) (view diffs)
• arch/ia32/include/boot/memmap.h (modified) (view diffs)
• arch/ia32/include/context.h (modified) (view diffs)
• arch/ia32/include/context_offset.h (modified) (view diffs)
• arch/ia32/include/cpu.h (modified) (view diffs)
• arch/ia32/include/drivers/i8259.h (modified) (view diffs)
• arch/ia32/include/interrupt.h (modified) (view diffs)
• arch/ia32/include/istate.h (modified) (view diffs)
• arch/ia32/include/mm/as.h (modified) (view diffs)
• arch/ia32/include/mm/page.h (modified) (view diffs)
• arch/ia32/include/pm.h (modified) (view diffs)
• arch/ia32/include/proc/thread.h (modified) (view diffs)
• arch/ia32/include/smp/ap.h (modified) (view diffs)
• arch/ia32/include/smp/apic.h (modified) (view diffs)
• arch/ia32/include/types.h (modified) (view diffs)
• arch/ia32/src/asm.S (modified) (view diffs)
• arch/ia32/src/bios/bios.c (modified) (view diffs)
• arch/ia32/src/boot/memmap.c (modified) (view diffs)
• arch/ia32/src/cpu/cpu.c (modified) (view diffs)
• arch/ia32/src/ddi/ddi.c (modified) (view diffs)
• arch/ia32/src/debug/stacktrace.c (modified) (view diffs)
• arch/ia32/src/drivers/i8254.c (modified) (view diffs)
• arch/ia32/src/drivers/i8259.c (modified) (view diffs)
• arch/ia32/src/drivers/vesa.c (modified) (view diffs)
• arch/ia32/src/ia32.c (modified) (view diffs)
• arch/ia32/src/interrupt.c (modified) (view diffs)
• arch/ia32/src/mm/frame.c (modified) (view diffs)
• arch/ia32/src/mm/page.c (modified) (view diffs)
• arch/ia32/src/smp/apic.c (modified) (view diffs)
• arch/ia32/src/smp/mps.c (modified) (view diffs)
• arch/ia64/_link.ld.in (modified) (view diffs)
• arch/ia64/include/bootinfo.h (modified) (view diffs)
• arch/ia64/include/interrupt.h (modified) (view diffs)
• arch/ia64/include/types.h (modified) (view diffs)
• arch/ia64/src/asm.S (modified) (view diffs)
• arch/ia64/src/ia64.c (modified) (view diffs)
• arch/ia64/src/interrupt.c (modified) (view diffs)
• arch/ia64/src/ivt.S (modified) (view diffs)
• arch/ia64/src/mm/tlb.c (modified) (view diffs)
• arch/ia64/src/start.S (modified) (view diffs)
• arch/mips32/include/atomic.h (modified) (view diffs)
• arch/mips32/include/cp0.h (modified) (view diffs)
• arch/mips32/include/debugger.h (modified) (view diffs)
• arch/mips32/include/fpu_context.h (modified) (view diffs)
• arch/mips32/include/memstr.h (deleted)
• arch/mips32/include/types.h (modified) (view diffs)
• arch/mips32/src/asm.S (modified) (view diffs)
• arch/mips32/src/cache.c (modified) (view diffs)
• arch/mips32/src/debugger.c (modified) (view diffs)
• arch/mips32/src/exception.c (modified) (view diffs)
• arch/mips32/src/mips32.c (modified) (view diffs)
• arch/mips32/src/mm/frame.c (modified) (view diffs)
• arch/mips32/src/mm/tlb.c (modified) (view diffs)
• arch/mips32/src/smp/dorder.c (modified) (view diffs)
• arch/ppc32/_link.ld.in (modified) (view diffs)
• arch/ppc32/include/exception.h (modified) (view diffs)
• arch/ppc32/include/memstr.h (deleted)
• arch/ppc32/include/types.h (modified) (view diffs)
• arch/ppc32/src/asm.S (modified) (view diffs)
• arch/ppc32/src/cpu/cpu.c (modified) (view diffs)
• arch/ppc32/src/interrupt.c (modified) (view diffs)
• arch/ppc32/src/mm/frame.c (modified) (view diffs)
• arch/ppc32/src/mm/page.c (modified) (view diffs)
• arch/ppc32/src/mm/tlb.c (modified) (view diffs)
• arch/ppc32/src/ppc32.c (modified) (view diffs)
• arch/sparc64/_link.ld.in (modified) (view diffs)
• arch/sparc64/include/cpu.h (modified) (view diffs)
• arch/sparc64/include/memstr.h (deleted)
• arch/sparc64/include/mm/sun4u/tlb.h (modified) (view diffs)
• arch/sparc64/include/mm/sun4v/tlb.h (modified) (view diffs)
• arch/sparc64/include/sun4u/cpu.h (modified) (view diffs)
• arch/sparc64/include/types.h (modified) (view diffs)
• arch/sparc64/src/asm.S (modified) (view diffs)
• arch/sparc64/src/console.c (modified) (view diffs)
• arch/sparc64/src/drivers/niagara.c (modified) (view diffs)
• arch/sparc64/src/drivers/pci.c (modified) (view diffs)
• arch/sparc64/src/mm/sun4u/as.c (modified) (view diffs)
• arch/sparc64/src/mm/sun4u/frame.c (modified) (view diffs)
• arch/sparc64/src/mm/sun4u/tlb.c (modified) (view diffs)
• arch/sparc64/src/mm/sun4v/as.c (modified) (view diffs)
• arch/sparc64/src/mm/sun4v/tlb.c (modified) (view diffs)
• arch/sparc64/src/smp/sun4v/smp.c (modified) (view diffs)
• arch/sparc64/src/sun4u/sparc64.c (modified) (view diffs)
• arch/sparc64/src/sun4v/asm.S (modified) (view diffs)
• arch/sparc64/src/sun4v/md.c (modified) (view diffs)
• arch/sparc64/src/sun4v/sparc64.c (modified) (view diffs)
• arch/sparc64/src/sun4v/start.S (modified) (view diffs)
• arch/sparc64/src/trap/sun4v/interrupt.c (modified) (view diffs)
• genarch/Makefile.inc (modified) (view diffs)
• genarch/src/acpi/acpi.c (modified) (view diffs)
• genarch/src/acpi/madt.c (modified) (view diffs)
• genarch/src/drivers/via-cuda/cuda.c (modified) (view diffs)
• genarch/src/kbrd/kbrd_pl050.c (deleted)
• genarch/src/kbrd/scanc_pl050.c (deleted)
• genarch/src/mm/page_ht.c (modified) (view diffs)
• genarch/src/ofw/ebus.c (modified) (view diffs)
• genarch/src/ofw/fhc.c (modified) (view diffs)
• genarch/src/ofw/ofw_tree.c (modified) (view diffs)
• genarch/src/ofw/pci.c (modified) (view diffs)
• genarch/src/ofw/upa.c (modified) (view diffs)
• generic/include/adt/hash_table.h (modified) (view diffs)
• generic/include/config.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/device.h (modified) (view diffs)
• generic/include/ddi/irq.h (modified) (view diffs)
• generic/include/debug.h (modified) (view diffs)
• generic/include/interrupt.h (modified) (view diffs)
• generic/include/ipc/event.h (modified) (view diffs)
• generic/include/ipc/event_types.h (modified) (view diffs)
• generic/include/ipc/ipc.h (modified) (view diffs)
• generic/include/ipc/ipcrsc.h (modified) (view diffs)
• generic/include/ipc/irq.h (modified) (view diffs)
• generic/include/ipc/sysipc.h (modified) (view diffs)
• generic/include/lib/memfnc.h (moved) (moved from kernel/generic/include/syscall/sysarg64.h ) (view diffs)
• generic/include/macros.h (modified) (view diffs)
• generic/include/memstr.h (modified) (view diffs)
• generic/include/mm/as.h (modified) (view diffs)
• generic/include/mm/frame.h (modified) (view diffs)
• generic/include/mm/reserve.h (added)
• generic/include/mm/slab.h (modified) (view diffs)
• generic/include/panic.h (modified) (view diffs)
• generic/include/print.h (modified) (view diffs)
• generic/include/proc/program.h (modified) (view diffs)
• generic/include/proc/task.h (modified) (view diffs)
• generic/include/proc/thread.h (modified) (view diffs)
• generic/include/security/cap.h (modified) (view diffs)
• generic/include/stdint.h (modified) (view diffs)
• generic/include/str.h (modified) (view diffs)
• generic/include/synch/futex.h (modified) (view diffs)
• generic/include/synch/smc.h (modified) (view diffs)
• generic/include/synch/spinlock.h (modified) (view diffs)
• generic/include/syscall/syscall.h (modified) (view diffs)
• generic/include/sysinfo/abi.h (modified) (view diffs)
• generic/include/sysinfo/sysinfo.h (modified) (view diffs)
• generic/include/time/clock.h (modified) (view diffs)
• generic/include/typedefs.h (modified) (view diffs)
• generic/include/udebug/udebug.h (modified) (view diffs)
• generic/include/udebug/udebug_ops.h (modified) (view diffs)
• generic/src/adt/avl.c (modified) (view diffs)
• generic/src/adt/bitmap.c (modified) (view diffs)
• generic/src/adt/btree.c (modified) (view diffs)
• generic/src/adt/hash_table.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/device.c (modified) (view diffs)
• generic/src/ddi/irq.c (modified) (view diffs)
• generic/src/debug/debug.c (modified) (view diffs)
• generic/src/debug/panic.c (modified) (view diffs)
• generic/src/debug/stacktrace.c (modified) (view diffs)
• generic/src/debug/symtab.c (modified) (view diffs)
• generic/src/interrupt/interrupt.c (modified) (view diffs)
• generic/src/ipc/event.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/elf.c (modified) (view diffs)
• generic/src/lib/memfnc.c (added)
• generic/src/lib/memstr.c (modified) (view diffs)
• generic/src/lib/rd.c (modified) (view diffs)
• generic/src/lib/str.c (modified) (view diffs)
• generic/src/main/kinit.c (modified) (view diffs)
• generic/src/main/main.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/backend_phys.c (modified) (view diffs)
• generic/src/mm/frame.c (modified) (view diffs)
• generic/src/mm/reserve.c (added)
• generic/src/mm/slab.c (modified) (view diffs)
• generic/src/printf/printf_core.c (modified) (view diffs)
• generic/src/proc/program.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/security/cap.c (modified) (view diffs)
• generic/src/synch/futex.c (modified) (view diffs)
• generic/src/synch/smc.c (modified) (view diffs)
• generic/src/synch/spinlock.c (modified) (view diffs)
• generic/src/synch/waitq.c (modified) (view diffs)
• generic/src/syscall/copy.c (modified) (view diffs)
• generic/src/syscall/syscall.c (modified) (view diffs)
• generic/src/sysinfo/stats.c (modified) (view diffs)
• generic/src/sysinfo/sysinfo.c (modified) (view diffs)
• generic/src/time/clock.c (modified) (view diffs)
• generic/src/udebug/udebug.c (modified) (view diffs)
• generic/src/udebug/udebug_ipc.c (modified) (view diffs)
• generic/src/udebug/udebug_ops.c (modified) (view diffs)
• test/avltree/avltree1.c (modified) (view diffs)
• test/fpu/fpu1_ia64.c (modified) (view diffs)
• test/fpu/fpu1_x86.c (modified) (view diffs)
• test/fpu/mips2.c (modified) (view diffs)
• test/fpu/sse1.c (modified) (view diffs)
• test/mm/falloc1.c (modified) (view diffs)
• test/mm/falloc2.c (modified) (view diffs)
• test/mm/mapping1.c (modified) (view diffs)
• test/mm/slab1.c (modified) (view diffs)
• test/print/print1.c (modified) (view diffs)
• test/print/print2.c (modified) (view diffs)
• test/print/print4.c (modified) (view diffs)
• test/print/print5.c (moved) (moved from kernel/generic/src/proc/tasklet.c ) (view diffs)
• test/print/print5.def (added)
• test/synch/semaphore1.c (modified) (view diffs)
• test/test.c (modified) (view diffs)
• test/test.h (modified) (view diffs)
• test/thread/thread1.c (modified) (view diffs)
• tools/genmap.py (modified) (view diffs)