Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / kernel / vserver / sched_init.h

diff --git a/kernel/vserver/sched_init.h b/kernel/vserver/sched_init.h
index 90d1396..cb97668 100644 (file)
--- a/kernel/vserver/sched_init.h
+++ b/kernel/vserver/sched_init.h
@@ -1,6 +1,7 @@
 
 static inline void vx_info_init_sched(struct _vx_sched *sched)
 {
+       static struct lock_class_key tokens_lock_key;
        int i;
 
        /* scheduling; hard code starting values as constants */
@@ -11,12 +12,14 @@ static inline void vx_info_init_sched(struct _vx_sched *sched)
        sched->jiffies          = jiffies;
        sched->tokens_lock      = SPIN_LOCK_UNLOCKED;
 
+       lockdep_set_class(&sched->tokens_lock, &tokens_lock_key);
+
        atomic_set(&sched->tokens, HZ >> 2);
        sched->cpus_allowed     = CPU_MASK_ALL;
        sched->priority_bias    = 0;
        sched->vavavoom         = 0;
 
-       for_each_cpu(i) {
+       for_each_possible_cpu(i) {
                sched->cpu[i].user_ticks        = 0;
                sched->cpu[i].sys_ticks         = 0;
                sched->cpu[i].hold_ticks        = 0;