Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs...

[karo-tx-linux.git] / kernel / sched_stats.h

diff --git a/kernel/sched_stats.h b/kernel/sched_stats.h
index 331e01bcd0260c9fc9db3269ba1416a83c355039..87f9e36ea56ef5b337150be441bb8c36f24ae048 100644 (file)
--- a/kernel/sched_stats.h
+++ b/kernel/sched_stats.h
@@ -282,10 +282,10 @@ static inline void account_group_user_time(struct task_struct *tsk,
        if (!cputimer->running)
                return;
 
-       spin_lock(&cputimer->lock);
+       raw_spin_lock(&cputimer->lock);
        cputimer->cputime.utime =
                cputime_add(cputimer->cputime.utime, cputime);
-       spin_unlock(&cputimer->lock);
+       raw_spin_unlock(&cputimer->lock);
 }
 
 /**
@@ -306,10 +306,10 @@ static inline void account_group_system_time(struct task_struct *tsk,
        if (!cputimer->running)
                return;
 
-       spin_lock(&cputimer->lock);
+       raw_spin_lock(&cputimer->lock);
        cputimer->cputime.stime =
                cputime_add(cputimer->cputime.stime, cputime);
-       spin_unlock(&cputimer->lock);
+       raw_spin_unlock(&cputimer->lock);
 }
 
 /**
@@ -330,7 +330,7 @@ static inline void account_group_exec_runtime(struct task_struct *tsk,
        if (!cputimer->running)
                return;
 
-       spin_lock(&cputimer->lock);
+       raw_spin_lock(&cputimer->lock);
        cputimer->cputime.sum_exec_runtime += ns;
-       spin_unlock(&cputimer->lock);
+       raw_spin_unlock(&cputimer->lock);
 }