Changeset 89c57b6 in mainline for kernel/generic/src/mm/page.c

Timestamp:

2011-04-13T14:45:41Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/generic/src/mm/page.c (modified) (3 diffs)

kernel/generic/src/mm/page.c

@@ -115 +115 @@
  *
  */
-void page_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame,
+NO_TRACE void page_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame,
     unsigned int flags)
 {
@@ -139 +139 @@
  *
  */
-void page_mapping_remove(as_t *as, uintptr_t page)
+NO_TRACE void page_mapping_remove(as_t *as, uintptr_t page)
 {
         ASSERT(page_table_locked(as));
@@ -163 +163 @@
  *
  */
-pte_t *page_mapping_find(as_t *as, uintptr_t page)
+NO_TRACE pte_t *page_mapping_find(as_t *as, uintptr_t page)
 {
         ASSERT(page_table_locked(as));