[patch 0/1] [IUCV] patch for net-2.6.25

[patch 0/1] [IUCV] patch for net-2.6.25

[Ursula Braun]

-- 
Dave,

this patch is intended for 2.6.25.
It enables compilation of net/iucv/iucv.c with !CONFIG_SMP.
Thanks to Jeff Sipek and Heiko Carstens.

Regards,
Ursula Braun

[patch 1/1] iucv: fix build error on !SMP

[Ursula Braun]

[-- Attachment #1: 717-iucv-nonsmp.diff --]
[-- Type: text/plain, Size: 1331 bytes --]

From: Heiko Carstens <heiko.carstens@de.ibm.com>
From: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Since a5fbb6d1064be885d2a6b82f625186753cf74848
"KVM: fix !SMP build error" smp_call_function isn't a define anymore
that folds into nothing but a define that calls up_smp_call_function
with all parameters. Hence we cannot #ifdef out the unused code
anymore...
This seems to be the preferred method, so do this for s390 as well.

net/iucv/iucv.c: In function 'iucv_cleanup_queue':
net/iucv/iucv.c:657: error: '__iucv_cleanup_queue' undeclared

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Signed-off-by: Ursula Braun <braunu@de.ibm.com>
---

 net/iucv/iucv.c |    2 --
 1 file changed, 2 deletions(-)

diff -urpN linux-2.6/net/iucv/iucv.c linux-2.6-patched/net/iucv/iucv.c
--- linux-2.6/net/iucv/iucv.c	2008-03-03 12:40:25.000000000 +0100
+++ linux-2.6-patched/net/iucv/iucv.c	2008-03-03 12:40:56.000000000 +0100
@@ -621,7 +621,6 @@ static int iucv_sever_pathid(u16 pathid,
 	return iucv_call_b2f0(IUCV_SEVER, parm);
 }
 
-#ifdef CONFIG_SMP
 /**
  * __iucv_cleanup_queue
  * @dummy: unused dummy argument
@@ -632,7 +631,6 @@ static int iucv_sever_pathid(u16 pathid,
 static void __iucv_cleanup_queue(void *dummy)
 {
 }
-#endif
 
 /**
  * iucv_cleanup_queue

-- 

Re: [patch 1/1] iucv: fix build error on !SMP

[David Miller]

From: Ursula Braun <braunu@de.ibm.com>
Date: Mon, 03 Mar 2008 14:16:11 +0100

> Since a5fbb6d1064be885d2a6b82f625186753cf74848
> "KVM: fix !SMP build error" smp_call_function isn't a define anymore
> that folds into nothing but a define that calls up_smp_call_function
> with all parameters. Hence we cannot #ifdef out the unused code
> anymore...
> This seems to be the preferred method, so do this for s390 as well.
> 
> net/iucv/iucv.c: In function 'iucv_cleanup_queue':
> net/iucv/iucv.c:657: error: '__iucv_cleanup_queue' undeclared
> 
> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
> Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
> Signed-off-by: Ursula Braun <braunu@de.ibm.com>

Applied, thanks.