Changeset 04803bf in mainline for kernel/generic/src/synch/smc.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• kernel/generic/src/synch/smc.c (modified) (1 diff)

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;