X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvserver%2Fsched.h;h=0f44693834ba2d682a61c1e944cb3098a25df824;hb=d46bc780027c5439db9f72d42c0732775b53925a;hp=d1a2068004621bf7d7222173e0b4e264d96e57ed;hpb=a8e794ca871505c8ea96cc102f4ad555c5231d7f;p=linux-2.6.git

diff --git a/include/linux/vserver/sched.h b/include/linux/vserver/sched.h
index d1a206800..0f4469383 100644
--- a/include/linux/vserver/sched.h
+++ b/include/linux/vserver/sched.h
@@ -24,15 +24,15 @@ struct _vx_sched {
 
 static inline void vx_info_init_sched(struct _vx_sched *sched)
 {
-        /* scheduling; hard code starting values as constants */
-        sched->fill_rate	= 1;
-        sched->interval		= 4;
-        sched->tokens_min	= HZ >> 4;
-        sched->tokens_max	= HZ >> 1;
-        sched->jiffies		= jiffies;
-        sched->tokens_lock	= SPIN_LOCK_UNLOCKED;
-
-        atomic_set(&sched->tokens, HZ >> 2);
+	/* scheduling; hard code starting values as constants */
+	sched->fill_rate	= 1;
+	sched->interval		= 4;
+	sched->tokens_min	= HZ >> 4;
+	sched->tokens_max	= HZ >> 1;
+	sched->jiffies		= jiffies;
+	sched->tokens_lock	= SPIN_LOCK_UNLOCKED;
+
+	atomic_set(&sched->tokens, HZ >> 2);
 	sched->cpus_allowed	= CPU_MASK_ALL;
 }
 
@@ -50,7 +50,7 @@ static inline int vx_info_proc_sched(struct _vx_sched *sched, char *buffer)
 		"Interval:\t%8d\n"		
 		"TokensMin:\t%8d\n"
 		"TokensMax:\t%8d\n"
-		,sched->ticks
+		,(unsigned long long)sched->ticks
 		,atomic_read(&sched->tokens)
 		,sched->fill_rate
 		,sched->interval
@@ -119,9 +119,9 @@ static inline int vx_need_resched(struct task_struct *p)
 		int tokens;
 
 		p->time_slice--;
-		if (atomic_read(&vxi->vx_refcount) < 1)
+		if (atomic_read(&vxi->vx_usecnt) < 1)
 			printk("need_resched: p=%p, s=%ld, ref=%d, id=%d/%d\n",
-				p, p->state, atomic_read(&vxi->vx_refcount),
+				p, p->state, atomic_read(&vxi->vx_usecnt),
 				vxi->vx_id, p->xid);
 		if ((tokens = vx_tokens_avail(vxi)) > 0)
 			vx_consume_token(vxi);