Merge branch 'master' into for-next

Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.

1 files changed, 6 insertions, 6 deletions

diff --git a/kernel/sched_stats.h b/kernel/sched_stats.h
index 331e01bcd026..87f9e36ea56e 100644
--- 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);
 }