- Timestamp:
- 2014-04-16T17:14:06Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- f857e8b
- Parents:
- dba3e2c (diff), 70b570c (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. - Location:
- kernel
- Files:
-
- 69 added
- 3 deleted
- 141 edited
- 6 moved
-
Makefile (modified) (view diffs)
-
arch/abs32le/include/arch/mm/frame.h (modified) (view diffs)
-
arch/abs32le/include/arch/mm/page.h (modified) (view diffs)
-
arch/amd64/include/arch/mm/frame.h (modified) (view diffs)
-
arch/amd64/include/arch/mm/page.h (modified) (view diffs)
-
arch/amd64/src/ddi/ddi.c (modified) (view diffs)
-
arch/amd64/src/interrupt.c (modified) (view diffs)
-
arch/amd64/src/proc/task.c (modified) (view diffs)
-
arch/arm32/Makefile.inc (modified) (view diffs)
-
arch/arm32/_link.ld.in (modified) (view diffs)
-
arch/arm32/include/arch/asm.h (modified) (view diffs)
-
arch/arm32/include/arch/cp15.h (modified) (view diffs)
-
arch/arm32/include/arch/mach/integratorcp/integratorcp.h (modified) (view diffs)
-
arch/arm32/include/arch/mach/raspberrypi/raspberrypi.h (added)
-
arch/arm32/include/arch/mm/frame.h (modified) (view diffs)
-
arch/arm32/include/arch/mm/page.h (modified) (view diffs)
-
arch/arm32/include/arch/mm/page_armv4.h (modified) (view diffs)
-
arch/arm32/include/arch/mm/page_armv6.h (modified) (view diffs)
-
arch/arm32/src/cpu/cpu.c (modified) (view diffs)
-
arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (modified) (view diffs)
-
arch/arm32/src/mach/beaglebone/beaglebone.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/raspberrypi/raspberrypi.c (added)
-
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/tlb.c (modified) (view diffs)
-
arch/arm32/src/ras.c (modified) (view diffs)
-
arch/ia32/include/arch/mm/frame.h (modified) (view diffs)
-
arch/ia32/include/arch/mm/page.h (modified) (view diffs)
-
arch/ia32/src/ddi/ddi.c (modified) (view diffs)
-
arch/ia32/src/drivers/i8259.c (modified) (view diffs)
-
arch/ia32/src/proc/task.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/include/arch/mm/frame.h (modified) (view diffs)
-
arch/ia64/src/ddi/ddi.c (modified) (view diffs)
-
arch/ia64/src/drivers/ski.c (modified) (view diffs)
-
arch/ia64/src/mm/vhpt.c (modified) (view diffs)
-
arch/mips32/include/arch/asm.h (modified) (view diffs)
-
arch/mips32/include/arch/mm/frame.h (modified) (view diffs)
-
arch/mips32/include/arch/mm/page.h (modified) (view diffs)
-
arch/mips32/src/debugger.c (modified) (view diffs)
-
arch/mips32/src/exception.c (modified) (view diffs)
-
arch/mips32/src/mach/malta/malta.c (modified) (view diffs)
-
arch/mips32/src/mm/tlb.c (modified) (view diffs)
-
arch/mips64/include/arch/mm/frame.h (modified) (view diffs)
-
arch/ppc32/include/arch/mm/frame.h (modified) (view diffs)
-
arch/ppc32/include/arch/mm/page.h (modified) (view diffs)
-
arch/ppc32/src/interrupt.c (modified) (view diffs)
-
arch/sparc32/Makefile.inc (added)
-
arch/sparc32/_link.ld.in (added)
-
arch/sparc32/include/arch/ambapp.h (added)
-
arch/sparc32/include/arch/arch.h (added)
-
arch/sparc32/include/arch/asm.h (added)
-
arch/sparc32/include/arch/atomic.h (added)
-
arch/sparc32/include/arch/barrier.h (added)
-
arch/sparc32/include/arch/context.h (added)
-
arch/sparc32/include/arch/context_offset.h (added)
-
arch/sparc32/include/arch/cpu.h (added)
-
arch/sparc32/include/arch/cycle.h (added)
-
arch/sparc32/include/arch/elf.h (added)
-
arch/sparc32/include/arch/exception.h (added)
-
arch/sparc32/include/arch/faddr.h (added)
-
arch/sparc32/include/arch/fpu_context.h (added)
-
arch/sparc32/include/arch/interrupt.h (added)
-
arch/sparc32/include/arch/istate.h (added)
-
arch/sparc32/include/arch/machine/leon3/leon3.h (added)
-
arch/sparc32/include/arch/machine_func.h (added)
-
arch/sparc32/include/arch/mm/as.h (added)
-
arch/sparc32/include/arch/mm/asid.h (added)
-
arch/sparc32/include/arch/mm/frame.h (added)
-
arch/sparc32/include/arch/mm/km.h (added)
-
arch/sparc32/include/arch/mm/page.h (added)
-
arch/sparc32/include/arch/mm/page_fault.h (added)
-
arch/sparc32/include/arch/mm/tlb.h (added)
-
arch/sparc32/include/arch/proc/task.h (added)
-
arch/sparc32/include/arch/proc/thread.h (added)
-
arch/sparc32/include/arch/register.h (added)
-
arch/sparc32/include/arch/regwin.h (added)
-
arch/sparc32/include/arch/stack.h (added)
-
arch/sparc32/include/arch/trap.h (added)
-
arch/sparc32/include/arch/types.h (added)
-
arch/sparc32/src/context.S (added)
-
arch/sparc32/src/cpu/cpu.c (added)
-
arch/sparc32/src/ddi/ddi.c (added)
-
arch/sparc32/src/debug/stacktrace.c (added)
-
arch/sparc32/src/exception.c (added)
-
arch/sparc32/src/machine/leon3/leon3.c (added)
-
arch/sparc32/src/machine_func.c (added)
-
arch/sparc32/src/mm/as.c (added)
-
arch/sparc32/src/mm/frame.c (added)
-
arch/sparc32/src/mm/km.c (added)
-
arch/sparc32/src/mm/page.c (added)
-
arch/sparc32/src/mm/tlb.c (added)
-
arch/sparc32/src/proc/scheduler.c (added)
-
arch/sparc32/src/proc/task.c (added)
-
arch/sparc32/src/proc/thread.c (added)
-
arch/sparc32/src/smp/ipi.c (added)
-
arch/sparc32/src/smp/smp.c (added)
-
arch/sparc32/src/sparc32.c (added)
-
arch/sparc32/src/start.S (added)
-
arch/sparc32/src/trap_table.S (added)
-
arch/sparc32/src/userspace.c (added)
-
arch/sparc64/include/arch/mm/frame.h (modified) (view diffs)
-
arch/sparc64/include/arch/mm/sun4u/frame.h (modified) (view diffs)
-
arch/sparc64/include/arch/mm/sun4v/frame.h (modified) (view diffs)
-
arch/sparc64/include/arch/trap/sun4v/mmu.h (modified) (view diffs)
-
arch/sparc64/src/drivers/kbd.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/drivers/scr.c (modified) (view diffs)
-
arch/sparc64/src/mm/sun4u/as.c (modified) (view diffs)
-
arch/sparc64/src/mm/sun4v/as.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/smp/sun4u/smp.c (modified) (view diffs)
-
arch/sparc64/src/sun4v/md.c (modified) (view diffs)
-
arch/sparc64/src/sun4v/start.S (modified) (view diffs)
-
arch/sparc64/src/trap/sun4u/interrupt.c (modified) (view diffs)
-
arch/sparc64/src/trap/sun4v/interrupt.c (modified) (view diffs)
-
doc/doxygroups.h (modified) (view diffs)
-
doc/mm (modified) (view diffs)
-
genarch/Makefile.inc (modified) (view diffs)
-
genarch/include/genarch/drivers/am335x/irc.h (modified) (view diffs)
-
genarch/include/genarch/drivers/amdm37x/gpt.h (modified) (view diffs)
-
genarch/include/genarch/drivers/amdm37x/irc.h (modified) (view diffs)
-
genarch/include/genarch/drivers/arm926_uart/arm926_uart.h (deleted)
-
genarch/include/genarch/drivers/bcm2835/irc.h (added)
-
genarch/include/genarch/drivers/bcm2835/mbox.h (added)
-
genarch/include/genarch/drivers/bcm2835/timer.h (added)
-
genarch/include/genarch/drivers/grlib/irqmp.h (added)
-
genarch/include/genarch/drivers/grlib/timer.h (added)
-
genarch/include/genarch/drivers/grlib/uart.h (added)
-
genarch/include/genarch/drivers/omap/irc.h (added)
-
genarch/include/genarch/drivers/pl011/pl011.h (added)
-
genarch/include/genarch/drivers/s3c24xx/irqc.h (moved) (moved from kernel/genarch/include/genarch/drivers/s3c24xx_irqc/s3c24xx_irqc.h ) (view diffs)
-
genarch/include/genarch/drivers/s3c24xx/timer.h (moved) (moved from kernel/genarch/include/genarch/drivers/s3c24xx_timer/s3c24xx_timer.h ) (view diffs)
-
genarch/include/genarch/drivers/s3c24xx/uart.h (moved) (moved from kernel/genarch/include/genarch/drivers/s3c24xx_uart/s3c24xx_uart.h ) (view diffs)
-
genarch/include/genarch/fb/fb.h (modified) (view diffs)
-
genarch/include/genarch/mm/page_pt.h (modified) (view diffs)
-
genarch/src/acpi/acpi.c (modified) (view diffs)
-
genarch/src/acpi/madt.c (modified) (view diffs)
-
genarch/src/drivers/am335x/timer.c (modified) (view diffs)
-
genarch/src/drivers/bcm2835/mbox.c (added)
-
genarch/src/drivers/dsrln/dsrlnout.c (modified) (view diffs)
-
genarch/src/drivers/ega/ega.c (modified) (view diffs)
-
genarch/src/drivers/grlib/irqmp.c (added)
-
genarch/src/drivers/grlib/uart.c (added)
-
genarch/src/drivers/omap/uart.c (modified) (view diffs)
-
genarch/src/drivers/pl011/pl011.c (moved) (moved from kernel/genarch/src/drivers/arm926_uart/arm926_uart.c ) (view diffs)
-
genarch/src/drivers/s3c24xx/irqc.c (moved) (moved from kernel/genarch/src/drivers/s3c24xx_irqc/s3c24xx_irqc.c ) (view diffs)
-
genarch/src/drivers/s3c24xx/uart.c (moved) (moved from kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c ) (view diffs)
-
genarch/src/drivers/via-cuda/cuda.c (modified) (view diffs)
-
genarch/src/fb/fb.c (modified) (view diffs)
-
genarch/src/kbrd/kbrd.c (modified) (view diffs)
-
genarch/src/mm/as_pt.c (modified) (view diffs)
-
genarch/src/mm/page_pt.c (modified) (view diffs)
-
genarch/src/srln/srln.c (modified) (view diffs)
-
generic/include/adt/bitmap.h (modified) (view diffs)
-
generic/include/adt/list.h (modified) (view diffs)
-
generic/include/config.h (modified) (view diffs)
-
generic/include/console/chardev.h (modified) (view diffs)
-
generic/include/console/console.h (modified) (view diffs)
-
generic/include/debug.h (modified) (view diffs)
-
generic/include/log.h (added)
-
generic/include/macros.h (modified) (view diffs)
-
generic/include/mm/as.h (modified) (view diffs)
-
generic/include/mm/buddy.h (deleted)
-
generic/include/mm/frame.h (modified) (view diffs)
-
generic/include/mm/page.h (modified) (view diffs)
-
generic/include/mm/slab.h (modified) (view diffs)
-
generic/include/synch/spinlock.h (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/adt/list.c (modified) (view diffs)
-
generic/src/console/chardev.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/debug/panic.c (modified) (view diffs)
-
generic/src/debug/stacktrace.c (modified) (view diffs)
-
generic/src/ipc/ipc.c (modified) (view diffs)
-
generic/src/ipc/ipcrsc.c (modified) (view diffs)
-
generic/src/lib/func.c (modified) (view diffs)
-
generic/src/lib/memfnc.c (modified) (view diffs)
-
generic/src/lib/ra.c (modified) (view diffs)
-
generic/src/lib/rd.c (modified) (view diffs)
-
generic/src/log/log.c (added)
-
generic/src/main/kinit.c (modified) (view diffs)
-
generic/src/main/main.c (modified) (view diffs)
-
generic/src/main/shutdown.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/buddy.c (deleted)
-
generic/src/mm/frame.c (modified) (view diffs)
-
generic/src/mm/km.c (modified) (view diffs)
-
generic/src/mm/page.c (modified) (view diffs)
-
generic/src/mm/slab.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/synch/futex.c (modified) (view diffs)
-
generic/src/syscall/syscall.c (modified) (view diffs)
-
generic/src/sysinfo/stats.c (modified) (view diffs)
-
generic/src/time/clock.c (modified) (view diffs)
-
generic/src/udebug/udebug.c (modified) (view diffs)
-
generic/src/udebug/udebug_ops.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)
Note:
See TracChangeset
for help on using the changeset viewer.
