]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'tracing.2012.10.23c' into dev.3.8.2012.10.23d
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 23 Oct 2012 22:15:10 +0000 (15:15 -0700)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 23 Oct 2012 22:15:10 +0000 (15:15 -0700)
Resolved adjacent-change conflicts for kernel/rcutree.c.

1  2 
kernel/rcutree.c

index 8615c9f4c2ee210cb6ee5480c7298024a017bbe0,8edc71416ca6db7eb1a03f3980a1a782bbb1b5cb..45093733d776211b67d9a4dabaddbd548cc56081
@@@ -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), \