Changeset bfd7aac in mainline for kernel/arch/sparc64/src/mm/sun4u/tlb.c

Timestamp:

2010-02-17T19:19:08Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

1e2e0c1e

Parents:

01a9ef5 (diff), b8da2a3 (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.

File:

• kernel/arch/sparc64/src/mm/sun4u/tlb.c (moved) (moved from kernel/arch/sparc64/src/mm/tlb.c ) (2 diffs)

kernel/arch/sparc64/src/mm/sun4u/tlb.c

@@ -37 +37 @@
 #include <mm/as.h>
 #include <mm/asid.h>
-#include <genarch/mm/page_ht.h>
 #include <arch/mm/frame.h>
 #include <arch/mm/page.h>
@@ -51 +50 @@
 #include <panic.h>
 #include <arch/asm.h>
+#include <genarch/mm/page_ht.h>
 
 #ifdef CONFIG_TSB