X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Fvserver%2Fsched_init.h;h=aa78e1a7e5455d8c7aa6b96d16b362bd2056b0f2;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=90d13960f8af3ad0c26b9dd3e439a425bb5fbfc2;hpb=76828883507a47dae78837ab5dec5a5b4513c667;p=linux-2.6.git

diff --git a/kernel/vserver/sched_init.h b/kernel/vserver/sched_init.h
index 90d13960f..aa78e1a7e 100644
--- a/kernel/vserver/sched_init.h
+++ b/kernel/vserver/sched_init.h
@@ -1,26 +1,41 @@
 
 static inline void vx_info_init_sched(struct _vx_sched *sched)
 {
-	int i;
+	static struct lock_class_key tokens_lock_key;
 
 	/* scheduling; hard code starting values as constants */
-	sched->fill_rate	= 1;
-	sched->interval		= 4;
+	sched->fill_rate[0]	= 1;
+	sched->interval[0]	= 4;
+	sched->fill_rate[1]	= 1;
+	sched->interval[1]	= 8;
+	sched->tokens		= HZ >> 2;
 	sched->tokens_min	= HZ >> 4;
 	sched->tokens_max	= HZ >> 1;
-	sched->jiffies		= jiffies;
 	sched->tokens_lock	= SPIN_LOCK_UNLOCKED;
+	sched->prio_bias	= 0;
 
-	atomic_set(&sched->tokens, HZ >> 2);
-	sched->cpus_allowed	= CPU_MASK_ALL;
-	sched->priority_bias	= 0;
-	sched->vavavoom		= 0;
+	lockdep_set_class(&sched->tokens_lock, &tokens_lock_key);
+}
+
+static inline
+void vx_info_init_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
+{
+	sched_pc->fill_rate[0]	= 1;
+	sched_pc->interval[0]	= 4;
+	sched_pc->fill_rate[1]	= 1;
+	sched_pc->interval[1]	= 8;
+	sched_pc->tokens	= HZ >> 2;
+	sched_pc->tokens_min	= HZ >> 4;
+	sched_pc->tokens_max	= HZ >> 1;
+	sched_pc->prio_bias	= 0;
+	sched_pc->vavavoom	= 0;
+	sched_pc->token_time	= 0;
+	sched_pc->idle_time	= 0;
+	sched_pc->norm_time	= jiffies;
 
-	for_each_cpu(i) {
-		sched->cpu[i].user_ticks	= 0;
-		sched->cpu[i].sys_ticks		= 0;
-		sched->cpu[i].hold_ticks	= 0;
-	}
+	sched_pc->user_ticks = 0;
+	sched_pc->sys_ticks = 0;
+	sched_pc->hold_ticks = 0;
 }
 
 static inline void vx_info_exit_sched(struct _vx_sched *sched)
@@ -28,3 +43,8 @@ static inline void vx_info_exit_sched(struct _vx_sched *sched)
 	return;
 }
 
+static inline
+void vx_info_exit_sched_pc(struct _vx_sched_pc *sched_pc, int cpu)
+{
+	return;
+}