Changeset b1c57a8 in mainline for kernel/generic/src/proc/the.c

Timestamp:

2014-10-09T15:03:55Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e367939c

Parents:

21799398 (diff), 207e8880 (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 from lp:~adam-hraska+lp/helenos/rcu/.

Only merge from the feature branch and resolve all conflicts.

File:

• kernel/generic/src/proc/the.c (modified) (3 diffs)

kernel/generic/src/proc/the.c

@@ -43 +43 @@
 
 #include <arch.h>
+#include <debug.h>
 
 /** Initialize THE structure
@@ -53 +54 @@
 void the_initialize(the_t *the)
 {
-        the->preemption_disabled = 0;
+        the->preemption = 0;
         the->cpu = NULL;
         the->thread = NULL;
@@ -59 +60 @@
         the->as = NULL;
         the->magic = MAGIC;
+#ifdef RCU_PREEMPT_A    
+        the->rcu_nesting = 0;
+#endif
 }