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

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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

@@ -169 +169 @@
 }
 
-int page_find_mapping(uintptr_t virt, void **phys)
+int page_find_mapping(uintptr_t virt, uintptr_t *phys)
 {
         page_table_lock(AS, true);
@@ -179 +179 @@
         }
         
-        *phys = (void *) PTE_GET_FRAME(pte) +
+        *phys = PTE_GET_FRAME(pte) +
             (virt - ALIGN_DOWN(virt, PAGE_SIZE));
         
@@ -193 +193 @@
  *
  */
-sysarg_t sys_page_find_mapping(uintptr_t virt, void *phys_ptr)
-{
-        void *phys;
+sysarg_t sys_page_find_mapping(uintptr_t virt, uintptr_t *phys_ptr)
+{
+        uintptr_t phys;
         int rc = page_find_mapping(virt, &phys);
         if (rc != EOK)