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

[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@amd.com>
---
 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

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

[Ingo Molnar]

* Joerg Roedel <joerg.roedel@amd.com> wrote:

> This patch fixes the following build error for me:

just pushed out a similar fix from Hiroshi Shimamo - please check 
whether latest tip/master build fine for you.

	Ingo

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

[Joerg Roedel]

On Tue, Aug 19, 2008 at 11:58:02AM +0200, Ingo Molnar wrote:
> 
> * Joerg Roedel <joerg.roedel@amd.com> wrote:
> 
> > This patch fixes the following build error for me:
> 
> just pushed out a similar fix from Hiroshi Shimamo - please check 
> whether latest tip/master build fine for you.

It builds fine now. Thanks.

Joerg

-- 
           |           AMD Saxony Limited Liability Company & Co. KG
 Operating |         Wilschdorfer Landstr. 101, 01109 Dresden, Germany
 System    |                  Register Court Dresden: HRA 4896
 Research  |              General Partner authorized to represent:
 Center    |             AMD Saxony LLC (Wilmington, Delaware, US)
           | General Manager of AMD Saxony LLC: Dr. Hans-R. Deppe, Thomas McCoy