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

Timestamp:

2014-10-09T15:03:55Z (11 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/cpu.h (modified) (2 diffs)

kernel/generic/include/cpu.h

@@ -38 +38 @@
 #include <mm/tlb.h>
 #include <synch/spinlock.h>
+#include <synch/rcu_types.h>
 #include <proc/scheduler.h>
 #include <arch/cpu.h>
 #include <arch/context.h>
+#include <adt/list.h>
+#include <arch.h>
+
+#define CPU                  THE->cpu
+
 
 /** CPU structure.
@@ -94 +100 @@
         
         /**
+         * SMP calls to invoke on this CPU.
+         */
+        SPINLOCK_DECLARE(smp_calls_lock);
+        list_t smp_pending_calls;
+        
+        /** RCU per-cpu data. Uses own locking. */
+        rcu_cpu_data_t rcu;
+        
+        /**
          * Stack used by scheduler when there is no running thread.
          */