Changeset bc73be3 in mainline for kernel/generic/src/proc/current.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

• kernel/generic/src/proc/current.c (modified) (1 diff)

kernel/generic/src/proc/current.c

@@ -70 +70 @@
  *
  */
-NO_TRACE void current_copy(current_t *src, current_t *dst)
+_NO_TRACE void current_copy(current_t *src, current_t *dst)
 {
         assert(src->magic == MAGIC);