Changeset 95c675b in mainline for kernel/generic/src/syscall/copy.c

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• kernel/generic/src/syscall/copy.c (modified) (3 diffs)

kernel/generic/src/syscall/copy.c

@@ -39 +39 @@
  */
 
+#include <assert.h>
 #include <syscall/copy.h>
 #include <proc/thread.h>
@@ -63 +64 @@
         int rc;
         
-        ASSERT(THREAD);
-        ASSERT(!THREAD->in_copy_from_uspace);
+        assert(THREAD);
+        assert(!THREAD->in_copy_from_uspace);
         
         if (!KERNEL_ADDRESS_SPACE_SHADOWED) {
@@ -114 +115 @@
         int rc;
         
-        ASSERT(THREAD);
-        ASSERT(!THREAD->in_copy_to_uspace);
+        assert(THREAD);
+        assert(!THREAD->in_copy_to_uspace);
         
         if (!KERNEL_ADDRESS_SPACE_SHADOWED) {