Changeset 7bdcc45 in mainline for kernel/generic/include/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/include/synch

Files:

• futex.h (modified) (1 diff)
• smc.h (modified) (1 diff)
• spinlock.h (modified) (1 diff)

kernel/generic/include/synch/futex.h

@@ -52 +52 @@
 
 extern void futex_init(void);
-extern unative_t sys_futex_sleep(uintptr_t);
-extern unative_t sys_futex_wakeup(uintptr_t);
+extern sysarg_t sys_futex_sleep(uintptr_t);
+extern sysarg_t sys_futex_wakeup(uintptr_t);
 
 extern void futex_cleanup(void);

kernel/generic/include/synch/smc.h

@@ -36 +36 @@
 #define KERN_SMC_H_
 
-extern unative_t sys_smc_coherence(uintptr_t va, size_t size);
+extern sysarg_t sys_smc_coherence(uintptr_t va, size_t size);
 
 #endif

kernel/generic/include/synch/spinlock.h

@@ -146 +146 @@
         if ((pname)++ > (value)) { \
                 (pname) = 0; \
-                printf("Deadlock probe %s: exceeded threshold %u\n", \
+                printf("Deadlock probe %s: exceeded threshold %u\n" \
                     "cpu%u: function=%s, line=%u\n", \
                     #pname, (value), CPU->id, __func__, __LINE__); \