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

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• kernel/generic/src/mm/page.c (modified) (4 diffs)

kernel/generic/src/mm/page.c

@@ -95 +95 @@
  *
  */
-NO_TRACE 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)
 {
@@ -120 +120 @@
  *
  */
-NO_TRACE 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));
@@ -144 +144 @@
  *         the PTE is not guaranteed to be present.
  */
-NO_TRACE bool page_mapping_find(as_t *as, uintptr_t page, bool nolock,
+_NO_TRACE bool page_mapping_find(as_t *as, uintptr_t page, bool nolock,
     pte_t *pte)
 {
@@ -165 +165 @@
  * @param pte      New PTE.
  */
-NO_TRACE void page_mapping_update(as_t *as, uintptr_t page, bool nolock,
+_NO_TRACE void page_mapping_update(as_t *as, uintptr_t page, bool nolock,
     pte_t *pte)
 {