diff --git a/[refs] b/[refs] index 4ef82b7ba57e..6ba37f1c7ca5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48043bcdf8f398d28e75ffed6ee85208d751f87f +refs/heads/master: 1b7ae37c030a9fbbb5ebbf5d7bbfd7208cf805b7 diff --git a/trunk/kernel/marker.c b/trunk/kernel/marker.c index 3b75d0e8b5a4..e9c6b2bc9400 100644 --- a/trunk/kernel/marker.c +++ b/trunk/kernel/marker.c @@ -62,7 +62,7 @@ struct marker_entry { int refcount; /* Number of times armed. 0 if disarmed. */ struct rcu_head rcu; void *oldptr; - unsigned char rcu_pending:1; + int rcu_pending; unsigned char ptype:1; char name[0]; /* Contains name'\0'format'\0' */ };