Changeset df29f24 in mainline for kernel/arch/ppc32/include/mm/pht.h

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/include/mm/pht.h (moved) (moved from kernel/test/fpu/mips2_skip.c ) (2 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Martin Decky
+ * Copyright (c) 2006 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#include <test.h>
+/** @addtogroup ppc32mm
+ * @{
+ */
+/** @file
+ */
 
-const char *test_mips2(void)
-{
-        return NULL;
-}
+#ifndef KERN_ppc32_PHT_H_
+#define KERN_ppc32_PHT_H_
+
+#include <arch/interrupt.h>
+#include <typedefs.h>
+
+/* Forward declaration. */
+struct as;
+
+extern void pht_init(void);
+extern void pht_refill(unsigned int, istate_t *);
+extern void pht_invalidate(struct as *, uintptr_t, size_t);
+
+#endif
+
+/** @}
+ */