Changeset 387416b in mainline for kernel/arch/sparc64/src

Timestamp:

2009-12-12T10:11:35Z (16 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

99de22b

Parents:

58d5803d (diff), 1e4cada (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:

Synchronizing with head.

Location:

kernel/arch/sparc64/src

Files:

• drivers/kbd.c (modified) (1 diff)
• mm/page.c (modified) (1 diff)
• mm/sun4u/tlb.c (modified) (1 diff)
• mm/sun4v/tlb.c (modified) (1 diff)

kernel/arch/sparc64/src/drivers/kbd.c

@@ -39 +39 @@
 #include <console/console.h>
 #include <ddi/irq.h>
+#include <mm/page.h>
 #include <arch/mm/page.h>
 #include <arch/types.h>

kernel/arch/sparc64/src/mm/page.c

@@ -33 +33 @@
  */
 
+#include <mm/page.h>
 #include <arch/mm/page.h>
 #include <arch/mm/tlb.h>

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

@@ -50 +50 @@
 #include <panic.h>
 #include <arch/asm.h>
+#include <genarch/mm/page_ht.h>
 
 #ifdef CONFIG_TSB

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

@@ -54 +54 @@
 #include <arch/cpu.h>
 #include <arch/mm/pagesize.h>
+#include <genarch/mm/page_ht.h>
 
 #ifdef CONFIG_TSB