linux-next: manual merge of the tip tree with the cputime tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Martin Schwidefsky <schwidefsky@de.ibm.com>
Subject: linux-next: manual merge of the tip tree with the cputime tree
Date: Tue, 25 Oct 2011 18:44:21 +1100	[thread overview]
Message-ID: <20111025184421.5da0ec4a2551e162cfa6bd78@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1370 bytes --]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
kernel/sched_stats.h between commit f6116715d1ba ("[S390] cputime: add
sparse checking and cleanup") from the cputime tree and commit
ee30a7b2fc07 ("locking, sched: Annotate thread_group_cputimer as raw")
from the tip tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc kernel/sched_stats.h
index a455e62,87f9e36..0000000

--- a/kernel/sched_stats.h
+++ b/kernel/sched_stats.h
@@@ -282,9 -282,10 +282,9 @@@ static inline void account_group_user_t
  	if (!cputimer->running)
  		return;
  
- 	spin_lock(&cputimer->lock);
+ 	raw_spin_lock(&cputimer->lock);
 -	cputimer->cputime.utime =
 -		cputime_add(cputimer->cputime.utime, cputime);
 +	cputimer->cputime.utime += cputime;
- 	spin_unlock(&cputimer->lock);
+ 	raw_spin_unlock(&cputimer->lock);
  }
  
  /**
@@@ -305,9 -306,10 +305,9 @@@ static inline void account_group_system
  	if (!cputimer->running)
  		return;
  
- 	spin_lock(&cputimer->lock);
+ 	raw_spin_lock(&cputimer->lock);
 -	cputimer->cputime.stime =
 -		cputime_add(cputimer->cputime.stime, cputime);
 +	cputimer->cputime.stime += cputime;
- 	spin_unlock(&cputimer->lock);
+ 	raw_spin_unlock(&cputimer->lock);
  }
  
  /**

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
