Changeset df29f24 in mainline for kernel/arch/ppc32/src/interrupt.c

Timestamp:

2011-06-01T09:04:08Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0a7627b, c9f0975

Parents:

e51a514 (diff), 5d1b3aa (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

Conflicts - trivial to solve
In kernel/generic/src/mm/page.c - sys_page_find_mapping does
not use locking when accessing page tables (hope that is correct).

File:

• kernel/arch/ppc32/src/interrupt.c (modified) (2 diffs)

kernel/arch/ppc32/src/interrupt.c

@@ -42 +42 @@
 #include <arch/drivers/pic.h>
 #include <arch/mm/tlb.h>
+#include <arch/mm/pht.h>
 #include <print.h>
 
@@ -153 +154 @@
         exc_register(VECTOR_DECREMENTER, "timer", true,
             exception_decrementer);
+        exc_register(VECTOR_ITLB_MISS, "itlb_miss", true,
+            tlb_refill);
+        exc_register(VECTOR_DTLB_MISS_LOAD, "dtlb_miss_load", true,
+            tlb_refill);
+        exc_register(VECTOR_DTLB_MISS_STORE, "dtlb_miss_store", true,
+            tlb_refill);
 }