Changeset 00aece0 in mainline for kernel

Timestamp:

2012-02-18T16:47:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/Makefile.inc (modified) (view diffs)
• arch/abs32le/include/mm/frame.h (modified) (view diffs)
• arch/abs32le/include/mm/km.h (added)
• arch/abs32le/src/abs32le.c (modified) (view diffs)
• arch/abs32le/src/mm/frame.c (modified) (view diffs)
• arch/abs32le/src/mm/km.c (added)
• arch/abs32le/src/mm/page.c (modified) (view diffs)
• arch/amd64/Makefile.inc (modified) (view diffs)
• arch/amd64/include/arch.h (modified) (view diffs)
• arch/amd64/include/boot/boot.h (modified) (view diffs)
• arch/amd64/include/interrupt.h (modified) (view diffs)
• arch/amd64/include/mm/frame.h (modified) (view diffs)
• arch/amd64/include/mm/km.h (added)
• arch/amd64/src/amd64.c (modified) (view diffs)
• arch/amd64/src/boot/memmap.c (modified) (view diffs)
• arch/amd64/src/boot/multiboot.S (moved) (moved from kernel/arch/amd64/src/boot/boot.S ) (view diffs)
• arch/amd64/src/boot/multiboot2.S (added)
• arch/amd64/src/mm/km.c (added)
• arch/amd64/src/mm/page.c (modified) (view diffs)
• arch/arm32/Makefile.inc (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/mainpage.h (deleted)
• arch/arm32/include/mm/frame.h (modified) (view diffs)
• arch/arm32/include/mm/km.h (added)
• arch/arm32/include/mm/page.h (modified) (view diffs)
• arch/arm32/src/arm32.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/machine_func.c (modified) (view diffs)
• arch/arm32/src/mm/frame.c (modified) (view diffs)
• arch/arm32/src/mm/km.c (added)
• arch/arm32/src/mm/page.c (modified) (view diffs)
• arch/arm32/src/ras.c (modified) (view diffs)
• arch/ia32/Makefile.inc (modified) (view diffs)
• arch/ia32/include/arch.h (modified) (view diffs)
• arch/ia32/include/boot/boot.h (modified) (view diffs)
• arch/ia32/include/interrupt.h (modified) (view diffs)
• arch/ia32/include/mm/frame.h (modified) (view diffs)
• arch/ia32/include/mm/km.h (added)
• arch/ia32/src/boot/memmap.c (modified) (view diffs)
• arch/ia32/src/boot/multiboot.S (moved) (moved from kernel/arch/ia32/src/boot/boot.S ) (view diffs)
• arch/ia32/src/boot/multiboot2.S (added)
• arch/ia32/src/boot/vesa_prot.inc (modified) (view diffs)
• arch/ia32/src/boot/vesa_real.inc (modified) (view diffs)
• arch/ia32/src/ia32.c (modified) (view diffs)
• arch/ia32/src/mm/frame.c (modified) (view diffs)
• arch/ia32/src/mm/km.c (added)
• arch/ia32/src/mm/page.c (modified) (view diffs)
• arch/ia32/src/smp/ap.S (modified) (view diffs)
• arch/ia32/src/smp/smp.c (modified) (view diffs)
• arch/ia64/Makefile.inc (modified) (view diffs)
• arch/ia64/include/arch.h (modified) (view diffs)
• arch/ia64/include/asm.h (modified) (view diffs)
• arch/ia64/include/interrupt.h (modified) (view diffs)
• arch/ia64/include/legacyio.h (added)
• arch/ia64/include/mm/frame.h (modified) (view diffs)
• arch/ia64/include/mm/km.h (added)
• arch/ia64/include/mm/page.h (modified) (view diffs)
• arch/ia64/src/drivers/ski.c (modified) (view diffs)
• arch/ia64/src/ia64.c (modified) (view diffs)
• arch/ia64/src/mm/frame.c (modified) (view diffs)
• arch/ia64/src/mm/km.c (added)
• arch/ia64/src/mm/page.c (modified) (view diffs)
• arch/ia64/src/mm/tlb.c (modified) (view diffs)
• arch/ia64/src/start.S (modified) (view diffs)
• arch/mips32/Makefile.inc (modified) (view diffs)
• arch/mips32/include/mm/as.h (modified) (view diffs)
• arch/mips32/include/mm/frame.h (modified) (view diffs)
• arch/mips32/include/mm/km.h (added)
• arch/mips32/src/mips32.c (modified) (view diffs)
• arch/mips32/src/mm/frame.c (modified) (view diffs)
• arch/mips32/src/mm/km.c (added)
• arch/mips32/src/mm/page.c (modified) (view diffs)
• arch/mips32/src/mm/tlb.c (modified) (view diffs)
• arch/mips64/Makefile.inc (modified) (view diffs)
• arch/mips64/include/mm/frame.h (modified) (view diffs)
• arch/mips64/include/mm/km.h (added)
• arch/mips64/src/mips64.c (modified) (view diffs)
• arch/mips64/src/mm/frame.c (modified) (view diffs)
• arch/mips64/src/mm/km.c (added)
• arch/mips64/src/mm/page.c (modified) (view diffs)
• arch/ppc32/Makefile.inc (modified) (view diffs)
• arch/ppc32/include/mm/frame.h (modified) (view diffs)
• arch/ppc32/include/mm/km.h (added)
• arch/ppc32/src/drivers/pic.c (modified) (view diffs)
• arch/ppc32/src/mm/frame.c (modified) (view diffs)
• arch/ppc32/src/mm/km.c (added)
• arch/ppc32/src/mm/page.c (modified) (view diffs)
• arch/ppc32/src/ppc32.c (modified) (view diffs)
• arch/sparc64/Makefile.inc (modified) (view diffs)
• arch/sparc64/include/mm/km.h (added)
• arch/sparc64/include/mm/sun4u/frame.h (modified) (view diffs)
• arch/sparc64/include/mm/sun4u/km.h (added)
• arch/sparc64/include/mm/sun4v/frame.h (modified) (view diffs)
• arch/sparc64/include/mm/sun4v/km.h (added)
• arch/sparc64/src/drivers/kbd.c (modified) (view diffs)
• arch/sparc64/src/drivers/pci.c (modified) (view diffs)
• arch/sparc64/src/mm/page.c (modified) (view diffs)
• arch/sparc64/src/mm/sun4u/frame.c (modified) (view diffs)
• arch/sparc64/src/mm/sun4u/km.c (added)
• 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/km.c (added)
• arch/sparc64/src/mm/sun4v/tlb.c (modified) (view diffs)
• arch/sparc64/src/sun4u/sparc64.c (modified) (view diffs)
• arch/sparc64/src/sun4v/sparc64.c (modified) (view diffs)
• genarch/Makefile.inc (modified) (view diffs)
• genarch/include/fb/bfb.h (added)
• genarch/include/mm/page_ht.h (modified) (view diffs)
• genarch/include/multiboot/multiboot.h (modified) (view diffs)
• genarch/include/multiboot/multiboot2.h (added)
• genarch/src/acpi/acpi.c (modified) (view diffs)
• genarch/src/acpi/madt.c (modified) (view diffs)
• genarch/src/drivers/ega/ega.c (modified) (view diffs)
• genarch/src/drivers/i8042/i8042.c (modified) (view diffs)
• genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• genarch/src/fb/bfb.c (moved) (moved from kernel/arch/ia32/src/drivers/vesa.c ) (view diffs)
• genarch/src/fb/fb.c (modified) (view diffs)
• genarch/src/mm/as_ht.c (modified) (view diffs)
• genarch/src/mm/as_pt.c (modified) (view diffs)
• genarch/src/mm/page_ht.c (modified) (view diffs)
• genarch/src/mm/page_pt.c (modified) (view diffs)
• genarch/src/multiboot/multiboot.c (modified) (view diffs)
• genarch/src/multiboot/multiboot2.c (added)
• generic/include/adt/list.h (modified) (view diffs)
• generic/include/align.h (modified) (view diffs)
• generic/include/config.h (modified) (view diffs)
• generic/include/ddi/ddi.h (modified) (view diffs)
• generic/include/ddi/irq.h (modified) (view diffs)
• generic/include/ipc/ipc.h (modified) (view diffs)
• generic/include/ipc/irq.h (modified) (view diffs)
• generic/include/ipc/sysipc.h (modified) (view diffs)
• generic/include/lib/ra.h (added)
• generic/include/lib/rd.h (modified) (view diffs)
• generic/include/macros.h (modified) (view diffs)
• generic/include/mm/as.h (modified) (view diffs)
• generic/include/mm/frame.h (modified) (view diffs)
• generic/include/mm/km.h (added)
• generic/include/mm/page.h (modified) (view diffs)
• generic/include/synch/smc.h (modified) (view diffs)
• generic/include/syscall/syscall.h (modified) (view diffs)
• generic/include/sysinfo/sysinfo.h (modified) (view diffs)
• generic/include/typedefs.h (modified) (view diffs)
• generic/src/adt/btree.c (modified) (view diffs)
• generic/src/adt/list.c (modified) (view diffs)
• generic/src/console/cmd.c (modified) (view diffs)
• generic/src/cpu/cpu.c (modified) (view diffs)
• generic/src/ddi/ddi.c (modified) (view diffs)
• generic/src/ipc/irq.c (modified) (view diffs)
• generic/src/ipc/sysipc.c (modified) (view diffs)
• generic/src/lib/elf.c (modified) (view diffs)
• generic/src/lib/ra.c (added)
• generic/src/lib/rd.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/frame.c (modified) (view diffs)
• generic/src/mm/km.c (added)
• generic/src/mm/page.c (modified) (view diffs)
• generic/src/mm/reserve.c (modified) (view diffs)
• 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/thread.c (modified) (view diffs)
• generic/src/syscall/copy.c (modified) (view diffs)
• generic/src/syscall/syscall.c (modified) (view diffs)
• generic/src/sysinfo/sysinfo.c (modified) (view diffs)
• test/mm/mapping1.c (modified) (view diffs)
• test/mm/mapping1.def (modified) (view diffs)
• test/print/print2.c (modified) (view diffs)