[PATCH] fix build error in kernel/rcuclassic.c with latest tip/master

[Joerg Roedel]

This patch fixes the following build error for me:

  CC      kernel/rcuclassic.o
/data2/repos/tip/linux.trees.git/kernel/rcuclassic.c: In function â__rcu_process_callbacksâ:
/data2/repos/tip/linux.trees.git/kernel/rcuclassic.c:561: error: âflagsâ undeclared (first use in this function)
/data2/repos/tip/linux.trees.git/kernel/rcuclassic.c:561: error: (Each undeclared identifier is reported only once
/data2/repos/tip/linux.trees.git/kernel/rcuclassic.c:561: error: for each function it appears in.)
/data2/repos/tip/linux.trees.git/kernel/rcuclassic.c:561: warning: type defaults to âintâ in declaration of â__dummy2â
/data2/repos/tip/linux.trees.git/kernel/rcuclassic.c:561: warning: comparison of distinct pointer types lacks a cast
/data2/repos/tip/linux.trees.git/kernel/rcuclassic.c:566: warning: type defaults to âintâ in declaration of â__dummy2â
/data2/repos/tip/linux.trees.git/kernel/rcuclassic.c:566: warning: comparison of distinct pointer types lacks a cast
/data2/repos/tip/linux.trees.git/kernel/rcuclassic.c: In function ârcu_init_percpu_dataâ:
/data2/repos/tip/linux.trees.git/kernel/rcuclassic.c:713: warning: comparison of distinct pointer types lacks a cast
/data2/repos/tip/linux.trees.git/kernel/rcuclassic.c:721: warning: comparison of distinct pointer types lacks a cast
make[2]: *** [kernel/rcuclassic.o] Error 1

Signed-off-by: Joerg Roedel <joerg.roedel@xxxxxxx>
---
 kernel/rcuclassic.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/kernel/rcuclassic.c b/kernel/rcuclassic.c
index c6b6cf5..2f193e1 100644
--- a/kernel/rcuclassic.c
+++ b/kernel/rcuclassic.c
@@ -557,6 +557,8 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp,
 		local_irq_enable();
 
 		if (rcu_batch_after(rdp->batch, rcp->pending)) {
+			unsigned long flags;
+
 			/* and start it/schedule start if it's a new batch */
 			spin_lock_irqsave(&rcp->lock, flags);
 			if (rcu_batch_after(rdp->batch, rcp->pending)) {
@@ -708,7 +710,7 @@ void rcu_check_callbacks(int cpu, int user)
 static void rcu_init_percpu_data(int cpu, struct rcu_ctrlblk *rcp,
 						struct rcu_data *rdp)
 {
-	long flags;
+	unsigned long flags;
 
 	spin_lock_irqsave(&rcp->lock, flags);
 	memset(rdp, 0, sizeof(*rdp));
-- 
1.5.3.7


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/