From: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Date: Tue, 23 Oct 2012 22:15:10 +0000 (-0700)
Subject: Merge branch 'tracing.2012.10.23c' into dev.3.8.2012.10.23d
X-Git-Tag: next-20121024~29^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1a0ec9cc029e83146e4070297903757948a18bbb;p=karo-tx-linux.git

Merge branch 'tracing.2012.10.23c' into dev.3.8.2012.10.23d

Resolved adjacent-change conflicts for kernel/rcutree.c.
---

1a0ec9cc029e83146e4070297903757948a18bbb
diff --cc kernel/rcutree.c
index 8615c9f4c2ee,8edc71416ca6..45093733d776
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@@ -68,9 -68,9 +68,9 @@@ static struct lock_class_key rcu_fqs_cl
  	.level = { &sname##_state.node[0] }, \
  	.call = cr, \
  	.fqs_state = RCU_GP_IDLE, \
- 	.gpnum = -300, \
- 	.completed = -300, \
+ 	.gpnum = 0UL - 300UL, \
+ 	.completed = 0UL - 300UL, \
 -	.onofflock = __RAW_SPIN_LOCK_UNLOCKED(&sname##_state.onofflock), \
 +	.orphan_lock = __RAW_SPIN_LOCK_UNLOCKED(&sname##_state.orphan_lock), \
  	.orphan_nxttail = &sname##_state.orphan_nxtlist, \
  	.orphan_donetail = &sname##_state.orphan_donelist, \
  	.barrier_mutex = __MUTEX_INITIALIZER(sname##_state.barrier_mutex), \