Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[muen/linux.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 56dd65f1be4f416f8374645ad6d9fb1b50ca1fad..58e2af8d064b29c4547f80097b7bd29b6c9c8f70 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -571,12 +571,8 @@ union rcu_special {
        struct {
                u8                      blocked;
                u8                      need_qs;
-               u8                      exp_need_qs;
-
-               /* Otherwise the compiler can store garbage here: */
-               u8                      pad;
        } b; /* Bits. */
-       u32 s; /* Set of bits. */
+       u16 s; /* Set of bits. */
 };
 
 enum perf_event_task_context {