From 3000a53ca6b0edad4da43f03587053a83565de44 Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Fri, 10 Oct 2008 14:43:57 +0800
Subject: [PATCH] --- yaml --- r: 116643 b: refs/heads/master c:
 1b7ae37c030a9fbbb5ebbf5d7bbfd7208cf805b7 h: refs/heads/master i:   116641:
 9bcab1b1bdf413b291f2f4d3be5eb334cdf70f11   116639:
 e9579acdade2d8b44fa2fd956b4cdb99ef2f2972 v: v3

---
 [refs]                | 2 +-
 trunk/kernel/marker.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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' */
 };