Changeset ab936440 in mainline for kernel/generic/src/proc

Timestamp:

2019-02-12T20:42:42Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

Location:

kernel/generic/src/proc

Files:

• current.c (modified) (1 diff)
• task.c (modified) (1 diff)
• thread.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);

kernel/generic/src/proc/task.c

@@ -269 +269 @@
 {
         /*
-         * Remove the task from the task B+tree.
+         * Remove the task from the task odict.
          */
         irq_spinlock_lock(&tasks_lock, true);

kernel/generic/src/proc/thread.c

@@ -180 +180 @@
          * covered by the kernel identity mapping, which guarantees not to
          * nest TLB-misses infinitely (either via some hardware mechanism or
-         * by the construciton of the assembly-language part of the TLB-miss
+         * by the construction of the assembly-language part of the TLB-miss
          * handler).
          *
          * This restriction can be lifted once each architecture provides
-         * a similar guarantee, for example by locking the kernel stack
+         * a similar guarantee, for example, by locking the kernel stack
          * in the TLB whenever it is allocated from the high-memory and the
          * thread is being scheduled to run.