Removed incomplete zone-based implementation.

4 files changed, 16 insertions, 20 deletions

diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index 382ba6ef49..ac5756dd49 100644
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -346,17 +346,15 @@
 #define __NR_down               336
 #define __NR_up                 337
 #define __NR_sema_free          338
-#define __NR_in_blocking_zone   339
-#define __NR_wait_for_zone_exit 340
-#define __NR_srp_sema_init      341
-#define __NR_srp_down           342
-#define __NR_srp_up             343
-#define __NR_reg_task_srp_sem   344
-#define __NR_srp_sema_free      345
+#define __NR_srp_sema_init      339
+#define __NR_srp_down           340
+#define __NR_srp_up             341
+#define __NR_reg_task_srp_sem   342
+#define __NR_srp_sema_free      343
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 345
+#define NR_syscalls 343
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/include/linux/litmus.h b/include/linux/litmus.h
index c325164e93..5073a9c7ad 100644
--- a/include/linux/litmus.h
+++ b/include/linux/litmus.h
@@ -51,9 +51,6 @@ typedef enum {
 #define MODE_NON_RT     0
 #define MODE_RT_RUN     1
 
-/* Size of blocking zone, in microseconds. */
-#define ZONE_SIZE       100
-
 /*      Plugin boot options, for convenience */
 #define PLUGIN_LINUX            "linux"
 #define PLUGIN_PFAIR            "pfair"
diff --git a/include/linux/rt_param.h b/include/linux/rt_param.h
index 6d7ff9ea6e..e9bedd360e 100644
--- a/include/linux/rt_param.h
+++ b/include/linux/rt_param.h
@@ -79,11 +79,6 @@ typedef struct task_rt_param {
         in_times_t times;
         in_times_t backup;
 
-        /* for zone-based locking: flag indicating whether task
-         * is waiting for the end of the blocking zone
-         */
-        int waiting_to_exit_zone;
-
         /* is this task under control of litmus?
          *
          * this is necessary because otherwise signal delivery code
@@ -97,6 +92,12 @@ typedef struct task_rt_param {
          * plugin to avoid race conditions.
          */
         int                     scheduled_on;
+
+        /* This field can be used by plugins to store where the task
+         * is currently linked. It is the responsibility of the plugin
+         * to avoid race conditions.
+         */
+        int                     linked_on;
 } task_rt_param_t;
 
 /*      Possible RT flags       */
@@ -154,9 +155,9 @@ memset(&(t)->rt_param,0, sizeof(struct task_rt_param))
         (b)->rt_param.times.release))
 
 #define backup_times(t) do { (t)->rt_param.backup=(t)->rt_param.times; \
-                                } while(0);
+                        } while(0);
 #define restore_times(t) do { (t)->rt_param.times=(t)->rt_param.backup; \
-                                } while(0);
+                         } while(0);
 
 /* struct for semaphore with priority inheritance */
 struct pi_semaphore {
diff --git a/include/linux/wait.h b/include/linux/wait.h
index 8e05b5a410..c7e96b6b59 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -348,7 +348,7 @@ do {									\
 })
 
 /*
- * Must be called with the queuelock in the wait_queue_head_t held.
+ * Must be called with the spinlock in the wait_queue_head_t held.
  */
 static inline void add_wait_queue_exclusive_locked(wait_queue_head_t *q,
                                                    wait_queue_t * wait)
@@ -358,7 +358,7 @@ static inline void add_wait_queue_exclusive_locked(wait_queue_head_t *q,
 }
 
 /*
- * Must be called with the queuelock in the wait_queue_head_t held.
+ * Must be called with the spinlock in the wait_queue_head_t held.
  */
 static inline void remove_wait_queue_locked(wait_queue_head_t *q,
                                             wait_queue_t * wait)