Changeset 46c20c8 in mainline for kernel/generic/include/proc/scheduler.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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 mainline changes.

File:

• kernel/generic/include/proc/scheduler.h (modified) (2 diffs)

kernel/generic/include/proc/scheduler.h

@@ -37 +37 @@
 
 #include <synch/spinlock.h>
-#include <time/clock.h>         /* HZ */
+#include <time/clock.h>
+#include <typedefs.h>
 #include <atomic.h>
 #include <adt/list.h>
 
-#define RQ_COUNT                16
-#define NEEDS_RELINK_MAX        (HZ)
+#define RQ_COUNT          16
+#define NEEDS_RELINK_MAX  (HZ)
 
 /** Scheduler run queue structure. */
 typedef struct {
-        SPINLOCK_DECLARE(lock);
-        link_t rq_head;         /**< List of ready threads. */
-        size_t n;               /**< Number of threads in rq_ready. */
+        IRQ_SPINLOCK_DECLARE(lock);
+        link_t rq_head;              /**< List of ready threads. */
+        size_t n;                    /**< Number of threads in rq_ready. */
 } runq_t;
 
@@ -61 +62 @@
 
 /*
- * To be defined by architectures:
+ * To be defined by architectures.
  */
 extern void before_task_runs_arch(void);