Fix a bunch of bugs that crept in while porting.

* Our old clone flag is already taken in 2.6.20.
* Fix wrong is_running() macro.
* Remove double ->finish_switch() call.
* Move sched_trace_scheduled to non-preemtible section.
* Allow next = idle task in RT mode.

3 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/litmus.h b/include/linux/litmus.h
index bbc68ae25c..529385d5f8 100644
--- a/include/linux/litmus.h
+++ b/include/linux/litmus.h
@@ -66,7 +66,6 @@ typedef enum {
         we just set its state to TASK_STOPPED
         It must be prepared and added to the ready queue explicitly
 */
-#define CLONE_REALTIME  0x04000000
 
 /*      Type definition for our quantums */
 typedef unsigned long long quantum_t;
diff --git a/include/linux/rt_param.h b/include/linux/rt_param.h
index 1d8e67f86a..1247a2ab22 100644
--- a/include/linux/rt_param.h
+++ b/include/linux/rt_param.h
@@ -102,7 +102,7 @@ memset(&(t)->rt_param,0, sizeof(struct task_rt_param))
 #define get_last_release_time(t)   ((t)->rt_param.times.last_release)
 #define set_last_release_time(t,r) ((t)->rt_param.times.last_releasee=(r))
 
-#define is_running(t)   ((t)->state & TASK_RUNNING)
+#define is_running(t)   ((t)->state == TASK_RUNNING)
 #define is_released(t)  (time_before_eq((t)->rt_param.times.release, jiffies))
 #define is_tardy(t)     (time_before_eq((t)->rt_param.times.deadline, jiffies))
 #define task_slack(t) ( (int) (t)->rt_param.times.deadline -  (int) jiffies - \
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9a8eea140a..f533ae3c63 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -28,6 +28,8 @@
 #define CLONE_STOPPED           0x02000000      /* Start in stopped state */
 #define CLONE_NEWUTS            0x04000000      /* New utsname group? */
 #define CLONE_NEWIPC            0x08000000      /* New ipcs */
+#define CLONE_REALTIME          0x10000000      /* LITMUS real-time task creation */
+
 
 /*
  * Scheduling policies