Changeset 1564c4b in mainline for kernel/arch/ppc32/include/mm/tlb.h

Timestamp:

2011-06-08T19:39:52Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

2af29ed

Parents:

e686889c (diff), 0eff68e (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

File:

• kernel/arch/ppc32/include/mm/tlb.h (modified) (2 diffs)

kernel/arch/ppc32/include/mm/tlb.h

@@ -37 +37 @@
 
 #include <arch/interrupt.h>
-#include <typedefs.h>
 
 #define WIMG_GUARDED    0x01
@@ -75 +74 @@
 } ptelo_t;
 
-extern void pht_init(void);
-extern void pht_refill(unsigned int, istate_t *);
-
-extern bool pht_refill_real(unsigned int, istate_t *)
-    __attribute__ ((section("K_UNMAPPED_TEXT_START")));
-extern void tlb_refill_real(unsigned int, uint32_t, ptehi_t, ptelo_t,
-    istate_t *) __attribute__ ((section("K_UNMAPPED_TEXT_START")));
+extern void tlb_refill(unsigned int, istate_t *);
 
 #endif