Changeset cefb126 in mainline for kernel

Timestamp:

2010-07-02T14:19:30Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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/atomic.h (modified) (view diffs)
• arch/abs32le/include/interrupt.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/arch.h (modified) (view diffs)
• arch/amd64/include/boot/boot.h (modified) (view diffs)
• arch/amd64/include/context.h (modified) (view diffs)
• arch/amd64/include/elf.h (modified) (view diffs)
• arch/amd64/include/faddr.h (modified) (view diffs)
• arch/amd64/include/interrupt.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/mm/ptl.h (modified) (view diffs)
• arch/amd64/include/mm/tlb.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 (added)
• arch/amd64/src/asm_utils.S (deleted)
• arch/amd64/src/boot/boot.S (modified) (view diffs)
• arch/amd64/src/boot/vesa_ret.inc (modified) (view diffs)
• arch/amd64/src/context.S (modified) (view diffs)
• arch/amd64/src/cpu/cpu.c (modified) (view diffs)
• arch/amd64/src/debug/stacktrace.c (modified) (view diffs)
• arch/amd64/src/debugger.c (modified) (view diffs)
• arch/amd64/src/delay.S (modified) (view diffs)
• arch/amd64/src/fpu_context.c (modified) (view diffs)
• arch/amd64/src/interrupt.c (modified) (view diffs)
• arch/amd64/src/mm/page.c (modified) (view diffs)
• arch/amd64/src/proc/scheduler.c (modified) (view diffs)
• arch/amd64/src/proc/task.c (modified) (view diffs)
• arch/amd64/src/proc/thread.c (modified) (view diffs)
• arch/amd64/src/smp/ap.S (modified) (view diffs)
• arch/arm32/Makefile.inc (modified) (view diffs)
• arch/arm32/include/exception.h (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/src/arm32.c (modified) (view diffs)
• arch/arm32/src/asm.S (modified) (view diffs)
• arch/arm32/src/exc_handler.S (modified) (view diffs)
• arch/arm32/src/exception.c (modified) (view diffs)
• arch/arm32/src/interrupt.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/machine_func.c (modified) (view diffs)
• arch/arm32/src/mm/frame.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/Makefile.inc (modified) (view diffs)
• arch/ia32/include/bios/bios.h (modified) (view diffs)
• arch/ia32/include/drivers/i8259.h (modified) (view diffs)
• arch/ia32/include/fpu_context.h (modified) (view diffs)
• arch/ia32/include/interrupt.h (modified) (view diffs)
• arch/ia32/include/mm/asid.h (modified) (view diffs)
• arch/ia32/include/smp/apic.h (modified) (view diffs)
• arch/ia32/include/smp/mps.h (modified) (view diffs)
• arch/ia32/include/smp/smp.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/boot.S (modified) (view diffs)
• arch/ia32/src/boot/vesa_prot.inc (modified) (view diffs)
• arch/ia32/src/boot/vesa_real.inc (modified) (view diffs)
• arch/ia32/src/boot/vesa_ret.inc (modified) (view diffs)
• arch/ia32/src/ia32.c (modified) (view diffs)
• arch/ia32/src/interrupt.c (modified) (view diffs)
• arch/ia32/src/mm/as.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/mm/tlb.c (modified) (view diffs)
• arch/ia32/src/smp/apic.c (modified) (view diffs)
• arch/ia32/src/smp/mps.c (modified) (view diffs)
• arch/ia32/src/smp/smp.c (modified) (view diffs)
• arch/ia64/src/asm.S (modified) (view diffs)
• arch/ia64/src/interrupt.c (modified) (view diffs)
• arch/ia64/src/mm/tlb.c (modified) (view diffs)
• arch/mips32/Makefile.inc (modified) (view diffs)
• arch/mips32/src/asm.S (modified) (view diffs)
• arch/mips32/src/debugger.c (modified) (view diffs)
• arch/mips32/src/exception.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/panic.S (deleted)
• arch/ppc32/Makefile.inc (modified) (view diffs)
• arch/ppc32/include/interrupt.h (modified) (view diffs)
• arch/ppc32/include/mm/tlb.h (modified) (view diffs)
• arch/ppc32/include/types.h (modified) (view diffs)
• arch/ppc32/src/asm.S (modified) (view diffs)
• arch/ppc32/src/debug/panic.s (deleted)
• arch/ppc32/src/interrupt.c (modified) (view diffs)
• arch/ppc32/src/mm/frame.c (modified) (view diffs)
• arch/ppc32/src/mm/tlb.c (modified) (view diffs)
• arch/sparc64/Makefile.inc (modified) (view diffs)
• arch/sparc64/include/drivers/tick.h (modified) (view diffs)
• arch/sparc64/include/types.h (modified) (view diffs)
• arch/sparc64/src/asm.S (modified) (view diffs)
• arch/sparc64/src/drivers/tick.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/frame.c (modified) (view diffs)
• arch/sparc64/src/mm/sun4v/tlb.c (modified) (view diffs)
• arch/sparc64/src/panic.S (deleted)
• arch/sparc64/src/trap/exception.c (modified) (view diffs)
• arch/sparc64/src/trap/sun4v/interrupt.c (modified) (view diffs)
• genarch/include/acpi/acpi.h (modified) (view diffs)
• genarch/include/acpi/madt.h (modified) (view diffs)
• genarch/src/acpi/acpi.c (modified) (view diffs)
• genarch/src/acpi/madt.c (modified) (view diffs)
• genarch/src/mm/as_pt.c (modified) (view diffs)
• genarch/src/mm/asid.c (modified) (view diffs)
• genarch/src/mm/page_ht.c (modified) (view diffs)
• genarch/src/mm/page_pt.c (modified) (view diffs)
• generic/include/atomic.h (modified) (view diffs)
• generic/include/config.h (modified) (view diffs)
• generic/include/console/console.h (modified) (view diffs)
• generic/include/context.h (modified) (view diffs)
• generic/include/cpu.h (modified) (view diffs)
• generic/include/debug.h (modified) (view diffs)
• generic/include/interrupt.h (modified) (view diffs)
• generic/include/macros.h (modified) (view diffs)
• generic/include/mm/tlb.h (modified) (view diffs)
• generic/include/panic.h (modified) (view diffs)
• generic/include/proc/task.h (modified) (view diffs)
• generic/include/proc/thread.h (modified) (view diffs)
• generic/include/smp/ipi.h (modified) (view diffs)
• generic/include/sort.h (modified) (view diffs)
• generic/include/stdint.h (moved) (moved from uspace/lib/c/arch/mips32/include/limits.h ) (view diffs)
• generic/include/synch/rwlock.h (deleted)
• generic/include/sysinfo/abi.h (modified) (view diffs)
• generic/include/typedefs.h (modified) (view diffs)
• generic/include/verify.h (moved) (moved from uspace/lib/c/arch/abs32le/include/limits.h ) (view diffs)
• generic/src/adt/btree.c (modified) (view diffs)
• generic/src/console/cmd.c (modified) (view diffs)
• generic/src/console/console.c (modified) (view diffs)
• generic/src/cpu/cpu.c (modified) (view diffs)
• generic/src/debug/debug.c (moved) (moved from kernel/test/synch/rwlock2.c ) (view diffs)
• generic/src/debug/panic.c (moved) (moved from uspace/lib/c/include/limits.h ) (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/sysipc.c (modified) (view diffs)
• generic/src/lib/sort.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/frame.c (modified) (view diffs)
• generic/src/mm/page.c (modified) (view diffs)
• generic/src/mm/slab.c (modified) (view diffs)
• generic/src/mm/tlb.c (modified) (view diffs)
• generic/src/proc/program.c (modified) (view diffs)
• generic/src/proc/scheduler.c (modified) (view diffs)
• generic/src/proc/the.c (modified) (view diffs)
• generic/src/proc/thread.c (modified) (view diffs)
• generic/src/smp/ipi.c (modified) (view diffs)
• generic/src/synch/futex.c (modified) (view diffs)
• generic/src/synch/rwlock.c (deleted)
• generic/src/sysinfo/stats.c (modified) (view diffs)
• generic/src/time/clock.c (modified) (view diffs)
• test/synch/rwlock1.c (deleted)
• test/synch/rwlock1.def (deleted)
• test/synch/rwlock2.def (deleted)
• test/synch/rwlock3.c (deleted)
• test/synch/rwlock3.def (deleted)
• test/synch/rwlock4.c (deleted)
• test/synch/rwlock4.def (deleted)
• test/synch/rwlock5.c (deleted)
• test/synch/rwlock5.def (deleted)
• test/test.c (modified) (view diffs)
• test/test.h (modified) (view diffs)