Changeset b1c57a8 in mainline for kernel/generic/include/arch.h

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/include/arch.h (modified) (5 diffs)

kernel/generic/include/arch.h

@@ -36 +36 @@
 #define KERN_ARCH_H_
 
-#include <arch/arch.h>
-#include <proc/thread.h>
-#include <proc/task.h>
-#include <mm/as.h>
+#include <arch/arch.h>  /* arch_pre_main() */
+#include <arch/asm.h>   /* get_stack_base() */
+#include <config.h>
+
 
 /*
@@ -49 +49 @@
 #define THE  ((the_t * )(get_stack_base()))
 
-#define CPU                  THE->cpu
-#define THREAD               THE->thread
-#define TASK                 THE->task
-#define AS                   THE->as
-#define PREEMPTION_DISABLED  THE->preemption_disabled
 #define MAGIC                UINT32_C(0xfacefeed)
 
@@ -62 +57 @@
         ((THE->task) ? (THE->task->container) : (DEFAULT_CONTAINER))
 
+/* Fwd decl. to avoid include hell. */
+struct thread;
+struct task;
+struct cpu;
+struct as;
+
 /**
  * For each possible kernel stack, structure
@@ -68 +69 @@
  */
 typedef struct {
-        size_t preemption_disabled;  /**< Preemption disabled counter. */
-        thread_t *thread;            /**< Current thread. */
-        task_t *task;                /**< Current task. */
-        cpu_t *cpu;                  /**< Executing cpu. */
-        as_t *as;                    /**< Current address space. */
-        uint32_t magic;              /**< Magic value */
+        size_t preemption;     /**< Preemption disabled counter and flag. */
+#ifdef RCU_PREEMPT_A
+        size_t rcu_nesting;    /**< RCU nesting count and flag. */
+#endif 
+        struct thread *thread; /**< Current thread. */
+        struct task *task;     /**< Current task. */
+        struct cpu *cpu;       /**< Executing cpu. */
+        struct as *as;         /**< Current address space. */
+        uint32_t magic;        /**< Magic value */
 } the_t;
 
@@ -91 +95 @@
 extern void *arch_construct_function(fncptr_t *, void *, void *);
 
+
 #endif