Revert to pre E17 ckrm memory controller back port code, which apparently

[linux-2.6.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 74719a9..9cb07d1 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -31,7 +31,6 @@
 #include <linux/percpu.h>
 #include <linux/topology.h>
 #include <linux/vs_base.h>
-#include <linux/taskdelays.h>
 
 struct exec_domain;
 extern int exec_shield;
@@ -268,8 +267,8 @@ struct mm_struct {
        struct kioctx           default_kioctx;
 #ifdef CONFIG_CKRM_RES_MEM
        struct ckrm_mem_res *memclass;
-       struct list_head tasklist;      /* tasks sharing this address space */
-       spinlock_t peertask_lock;       /* protect tasklist above */
+       struct list_head        tasklist; /* list of all tasks sharing this address space */
+       spinlock_t              peertask_lock; /* protect above tasklist */
 #endif
 };
 
@@ -719,25 +718,25 @@ struct task_struct {
        struct mempolicy *mempolicy;
        short il_next;          /* could be shared with used_math */
 #endif
+
 #ifdef CONFIG_CKRM
-       spinlock_t  ckrm_tsklock;
+       spinlock_t  ckrm_tsklock; 
        void       *ce_data;
 #ifdef CONFIG_CKRM_TYPE_TASKCLASS
+       // .. Hubertus should change to CONFIG_CKRM_TYPE_TASKCLASS 
        struct ckrm_task_class *taskclass;
-       struct list_head taskclass_link;
+       struct list_head        taskclass_link;
 #ifdef CONFIG_CKRM_CPU_SCHEDULE
         struct ckrm_cpu_class *cpu_class;
-       /* track cpu demand of this task */
+       //track cpu demand of this task
        struct ckrm_cpu_demand_stat demand_stat;
-#endif /* CONFIG_CKRM_CPU_SCHEDULE */
-#endif /* CONFIG_CKRM_TYPE_TASKCLASS */
+#endif //CONFIG_CKRM_CPU_SCHEDULE
+#endif // CONFIG_CKRM_TYPE_TASKCLASS
 #ifdef CONFIG_CKRM_RES_MEM
-       struct list_head mm_peers; /* list of tasks using same mm_struct */
-#endif
-#endif /* CONFIG_CKRM */
-#ifdef CONFIG_DELAY_ACCT
-       struct task_delay_info delays;
-#endif
+       struct list_head        mm_peers; // list of tasks using same mm_struct
+#endif // CONFIG_CKRM_RES_MEM
+#endif // CONFIG_CKRM
+       struct task_delay_info  delays;
 };
 
 static inline pid_t process_group(struct task_struct *tsk)
@@ -1304,86 +1303,6 @@ extern void normalize_rt_tasks(void);
 
 #endif
 
-/* API for registering delay info */
-#ifdef CONFIG_DELAY_ACCT
-
-#define test_delay_flag(tsk,flg)                ((tsk)->flags & (flg))
-#define set_delay_flag(tsk,flg)                 ((tsk)->flags |= (flg))
-#define clear_delay_flag(tsk,flg)               ((tsk)->flags &= ~(flg))
-
-#define def_delay_var(var)                     unsigned long long var
-#define get_delay(tsk,field)                    ((tsk)->delays.field)
-
-#define start_delay(var)                        ((var) = sched_clock())
-#define start_delay_set(var,flg)                (set_delay_flag(current,flg),(var) = sched_clock())
-
-#define inc_delay(tsk,field) (((tsk)->delays.field)++)
-
-/* because of hardware timer drifts in SMPs and task continue on different cpu
- * then where the start_ts was taken there is a possibility that
- * end_ts < start_ts by some usecs. In this case we ignore the diff
- * and add nothing to the total.
- */
-#ifdef CONFIG_SMP
-#define test_ts_integrity(start_ts,end_ts)  (likely((end_ts) > (start_ts)))
-#else
-#define test_ts_integrity(start_ts,end_ts)  (1)
-#endif
-
-#define add_delay_ts(tsk,field,start_ts,end_ts) \
-       do { if (test_ts_integrity(start_ts,end_ts)) (tsk)->delays.field += ((end_ts)-(start_ts)); } while (0)
-
-#define add_delay_clear(tsk,field,start_ts,flg)        \
-       do {                                           \
-               unsigned long long now = sched_clock();\
-               add_delay_ts(tsk,field,start_ts,now);  \
-               clear_delay_flag(tsk,flg);             \
-        } while (0)
-
-static inline void add_io_delay(unsigned long long dstart) 
-{
-       struct task_struct * tsk = current;
-       unsigned long long now = sched_clock();
-       unsigned long long val;
-
-       if (test_ts_integrity(dstart,now))
-               val = now - dstart;
-       else
-               val = 0;
-       if (test_delay_flag(tsk,PF_MEMIO)) {
-               tsk->delays.mem_iowait_total += val;
-               tsk->delays.num_memwaits++;
-       } else {
-               tsk->delays.iowait_total += val;
-               tsk->delays.num_iowaits++;
-       }
-       clear_delay_flag(tsk,PF_IOWAIT);
-}
-
-inline static void init_delays(struct task_struct *tsk)
-{
-       memset((void*)&tsk->delays,0,sizeof(tsk->delays));
-}
-
-#else
-
-#define test_delay_flag(tsk,flg)                (0)
-#define set_delay_flag(tsk,flg)                 do { } while (0)
-#define clear_delay_flag(tsk,flg)               do { } while (0)
-
-#define def_delay_var(var)                           
-#define get_delay(tsk,field)                    (0)
-
-#define start_delay(var)                        do { } while (0)
-#define start_delay_set(var,flg)                do { } while (0)
-
-#define inc_delay(tsk,field)                    do { } while (0)
-#define add_delay_ts(tsk,field,start_ts,now)    do { } while (0)
-#define add_delay_clear(tsk,field,start_ts,flg) do { } while (0)
-#define add_io_delay(dstart)                   do { } while (0) 
-#define init_delays(tsk)                        do { } while (0)
-#endif
-
 #endif /* __KERNEL__ */
 
 #endif