Changeset 7bdcc45 in mainline for kernel/genarch/src/mm/page_ht.c

Timestamp:

2010-12-16T16:38:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/genarch/src/mm/page_ht.c (modified) (7 diffs)

kernel/genarch/src/mm/page_ht.c

@@ -52 +52 @@
 #include <align.h>
 
-static size_t hash(unative_t[]);
-static bool compare(unative_t[], size_t, link_t *);
+static size_t hash(sysarg_t[]);
+static bool compare(sysarg_t[], size_t, link_t *);
 static void remove_callback(link_t *);
 
@@ -96 +96 @@
  *
  */
-size_t hash(unative_t key[])
+size_t hash(sysarg_t key[])
 {
         as_t *as = (as_t *) key[KEY_AS];
@@ -115 +115 @@
          *
          */
-        index |= ((unative_t) as) & (PAGE_HT_ENTRIES - 1);
+        index |= ((sysarg_t) as) & (PAGE_HT_ENTRIES - 1);
         
         return index;
@@ -129 +129 @@
  *
  */
-bool compare(unative_t key[], size_t keys, link_t *item)
+bool compare(sysarg_t key[], size_t keys, link_t *item)
 {
         ASSERT(item);
@@ -180 +180 @@
     unsigned int flags)
 {
-        unative_t key[2] = {
+        sysarg_t key[2] = {
                 (uintptr_t) as,
                 page = ALIGN_DOWN(page, PAGE_SIZE)
@@ -220 +220 @@
 void ht_mapping_remove(as_t *as, uintptr_t page)
 {
-        unative_t key[2] = {
+        sysarg_t key[2] = {
                 (uintptr_t) as,
                 page = ALIGN_DOWN(page, PAGE_SIZE)
@@ -247 +247 @@
 pte_t *ht_mapping_find(as_t *as, uintptr_t page)
 {
-        unative_t key[2] = {
+        sysarg_t key[2] = {
                 (uintptr_t) as,
                 page = ALIGN_DOWN(page, PAGE_SIZE)