Changeset 97c7682 in mainline for kernel

Timestamp:

2012-07-14T11:18:40Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

Location:

kernel

Files:

• Makefile (modified) (view diffs)
• arch/abs32le/include/mm/page.h (modified) (view diffs)
• arch/amd64/Makefile.inc (modified) (view diffs)
• arch/amd64/include/mm/page.h (modified) (view diffs)
• arch/amd64/src/mm/page.c (modified) (view diffs)
• arch/amd64/src/userspace.c (modified) (view diffs)
• arch/arm32/include/mm/page.h (modified) (view diffs)
• arch/arm32/include/mm/page_armv4.h (modified) (view diffs)
• arch/arm32/src/userspace.c (modified) (view diffs)
• arch/ia32/Makefile.inc (modified) (view diffs)
• arch/ia32/include/mm/page.h (modified) (view diffs)
• arch/ia32/src/mm/page.c (modified) (view diffs)
• arch/ia32/src/smp/apic.c (modified) (view diffs)
• arch/ia32/src/userspace.c (modified) (view diffs)
• arch/ia64/src/drivers/ski.c (modified) (view diffs)
• arch/ia64/src/ia64.c (modified) (view diffs)
• arch/mips32/include/mm/page.h (modified) (view diffs)
• arch/mips32/src/mips32.c (modified) (view diffs)
• arch/mips64/src/mips64.c (modified) (view diffs)
• arch/ppc32/include/mm/page.h (modified) (view diffs)
• arch/ppc32/src/ppc32.c (modified) (view diffs)
• arch/sparc64/Makefile.inc (modified) (view diffs)
• arch/sparc64/src/drivers/niagara.c (modified) (view diffs)
• arch/sparc64/src/proc/sun4u/scheduler.c (modified) (view diffs)
• arch/sparc64/src/proc/sun4v/scheduler.c (modified) (view diffs)
• arch/sparc64/src/proc/thread.c (modified) (view diffs)
• arch/sparc64/src/smp/sun4u/ipi.c (modified) (view diffs)
• arch/sparc64/src/sun4u/sparc64.c (modified) (view diffs)
• arch/sparc64/src/sun4v/sparc64.c (modified) (view diffs)
• genarch/include/mm/page_pt.h (modified) (view diffs)
• genarch/src/fb/fb.c (modified) (view diffs)
• genarch/src/kbrd/kbrd.c (modified) (view diffs)
• genarch/src/mm/as_ht.c (modified) (view diffs)
• genarch/src/mm/page_ht.c (modified) (view diffs)
• genarch/src/mm/page_pt.c (modified) (view diffs)
• genarch/src/srln/srln.c (modified) (view diffs)
• generic/include/console/prompt.h (moved) (moved from uspace/lib/net/include/icmp_client.h ) (view diffs)
• generic/include/debug.h (modified) (view diffs)
• generic/include/ipc/ipc.h (modified) (view diffs)
• generic/include/ipc/ipcrsc.h (modified) (view diffs)
• generic/include/lib/ra.h (modified) (view diffs)
• generic/include/mm/slab.h (modified) (view diffs)
• generic/include/proc/program.h (modified) (view diffs)
• generic/include/proc/thread.h (modified) (view diffs)
• generic/include/symtab.h (modified) (view diffs)
• generic/include/symtab_lookup.h (moved) (moved from uspace/lib/net/include/tl_remote.h ) (view diffs)
• generic/src/adt/btree.c (modified) (view diffs)
• generic/src/console/cmd.c (modified) (view diffs)
• generic/src/console/kconsole.c (modified) (view diffs)
• generic/src/console/prompt.c (added)
• generic/src/debug/symtab.c (modified) (view diffs)
• generic/src/ipc/ipc.c (modified) (view diffs)
• generic/src/ipc/kbox.c (modified) (view diffs)
• generic/src/ipc/sysipc.c (modified) (view diffs)
• generic/src/lib/ra.c (modified) (view diffs)
• 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/main/uinit.c (modified) (view diffs)
• generic/src/mm/as.c (modified) (view diffs)
• generic/src/mm/frame.c (modified) (view diffs)
• generic/src/mm/slab.c (modified) (view diffs)
• generic/src/mm/tlb.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/synch/mutex.c (modified) (view diffs)
• generic/src/synch/spinlock.c (modified) (view diffs)
• generic/src/sysinfo/sysinfo.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/slab1.c (modified) (view diffs)
• test/mm/slab2.c (modified) (view diffs)
• test/print/print1.c (modified) (view diffs)
• test/synch/semaphore1.c (modified) (view diffs)
• test/synch/semaphore2.c (modified) (view diffs)
• test/thread/thread1.c (modified) (view diffs)