Changeset 7bdcc45 in mainline for kernel/generic/src/synch

Timestamp:

2010-12-16T16:38:49Z (15 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.

Location:

kernel/generic/src/synch

Files:

• futex.c (modified) (8 diffs)
• smc.c (modified) (1 diff)
• spinlock.c (modified) (1 diff)

kernel/generic/src/synch/futex.c

@@ -60 +60 @@
 
 static futex_t *futex_find(uintptr_t paddr);
-static size_t futex_ht_hash(unative_t *key);
-static bool futex_ht_compare(unative_t *key, size_t keys, link_t *item);
+static size_t futex_ht_hash(sysarg_t *key);
+static bool futex_ht_compare(sysarg_t *key, size_t keys, link_t *item);
 static void futex_ht_remove_callback(link_t *item);
 
@@ -108 +108 @@
  *                      synch.h.
  */
-unative_t sys_futex_sleep(uintptr_t uaddr)
+sysarg_t sys_futex_sleep(uintptr_t uaddr)
 {
         futex_t *futex;
@@ -122 +122 @@
         if (!t || !PTE_VALID(t) || !PTE_PRESENT(t)) {
                 page_table_unlock(AS, true);
-                return (unative_t) ENOENT;
+                return (sysarg_t) ENOENT;
         }
         paddr = PTE_GET_FRAME(t) + (uaddr - ALIGN_DOWN(uaddr, PAGE_SIZE));
@@ -136 +136 @@
         udebug_stoppable_end();
 #endif
-        return (unative_t) rc;
+        return (sysarg_t) rc;
 }
 
@@ -145 +145 @@
  * @return              ENOENT if there is no physical mapping for uaddr.
  */
-unative_t sys_futex_wakeup(uintptr_t uaddr)
+sysarg_t sys_futex_wakeup(uintptr_t uaddr)
 {
         futex_t *futex;
@@ -158 +158 @@
         if (!t || !PTE_VALID(t) || !PTE_PRESENT(t)) {
                 page_table_unlock(AS, true);
-                return (unative_t) ENOENT;
+                return (sysarg_t) ENOENT;
         }
         paddr = PTE_GET_FRAME(t) + (uaddr - ALIGN_DOWN(uaddr, PAGE_SIZE));
@@ -235 +235 @@
  * @return              Index into futex hash table.
  */
-size_t futex_ht_hash(unative_t *key)
+size_t futex_ht_hash(sysarg_t *key)
 {
         return (*key & (FUTEX_HT_SIZE - 1));
@@ -247 +247 @@
  * @return              True if the item matches the key. False otherwise.
  */
-bool futex_ht_compare(unative_t *key, size_t keys, link_t *item)
+bool futex_ht_compare(sysarg_t *key, size_t keys, link_t *item)
 {
         futex_t *futex;

kernel/generic/src/synch/smc.c

@@ -42 +42 @@
 #include <synch/smc.h>
 
-unative_t sys_smc_coherence(uintptr_t va, size_t size)
+sysarg_t sys_smc_coherence(uintptr_t va, size_t size)
 {
-        if (overlaps(va, size, NULL, PAGE_SIZE))
+        if (overlaps(va, size, (uintptr_t) NULL, PAGE_SIZE))
                 return EINVAL;
 

kernel/generic/src/synch/spinlock.c

@@ -102 +102 @@
                 
                 if (i++ > DEADLOCK_THRESHOLD) {
-                        printf("cpu%u: looping on spinlock %" PRIp ":%s, "
-                            "caller=%" PRIp "(%s)\n", CPU->id, lock, lock->name,
-                            CALLER, symtab_fmt_name_lookup(CALLER));
+                        printf("cpu%u: looping on spinlock %p:%s, "
+                            "caller=%p (%s)\n", CPU->id, lock, lock->name,
+                            (void *) CALLER, symtab_fmt_name_lookup(CALLER));
                         
                         i = 0;