[PATCH linux-next] fix s390 compile error due to smp_call_function

[PATCH linux-next] fix s390 compile error due to smp_call_function

[Christian Borntraeger]

Hello Jens,

the following patch in linux-next (v2.6.26-rc9-7220-g5e36ed1)

commit 8691e5a8f691cc2a4fda0651e8d307aaba0e7d68
Author: Jens Axboe <jens.axboe@oracle.com>
Date:   Fri Jun 6 11:18:06 2008 +0200
smp_call_function: get rid of the unused nonatomic/retry argument

causes a build error on s390.
  CC      arch/s390/kernel/time.o
arch/s390/kernel/time.c: In function 'stp_work_fn':
arch/s390/kernel/time.c:1448: error: too many arguments to 
function 'smp_call_function'
arch/s390/kernel/time.c:1481: error: too many arguments to 
function 'smp_call_function'

The fix is simple and obvious, remove the unneeded argument.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

---
 arch/s390/kernel/time.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-next/arch/s390/kernel/time.c
===================================================================
--- linux-next.orig/arch/s390/kernel/time.c
+++ linux-next/arch/s390/kernel/time.c
@@ -1445,7 +1445,7 @@ static void stp_work_fn(struct work_stru
 	 */
 	memset(&stp_sync, 0, sizeof(stp_sync));
 	preempt_disable();
-	smp_call_function(clock_sync_cpu_start, &stp_sync, 0, 0);
+	smp_call_function(clock_sync_cpu_start, &stp_sync, 0);
 	local_irq_disable();
 	enable_sync_clock();
 
@@ -1478,7 +1478,7 @@ static void stp_work_fn(struct work_stru
 		stp_sync.in_sync = 1;
 
 	local_irq_enable();
-	smp_call_function(clock_sync_cpu_end, NULL, 0, 0);
+	smp_call_function(clock_sync_cpu_end, NULL, 0);
 	preempt_enable();
 }
 

Re: [PATCH linux-next] fix s390 compile error due to smp_call_function

[Heiko Carstens]

On Tue, Jul 08, 2008 at 04:25:50PM +0200, Christian Borntraeger wrote:
> Hello Jens,
> 
> the following patch in linux-next (v2.6.26-rc9-7220-g5e36ed1)
> 
> commit 8691e5a8f691cc2a4fda0651e8d307aaba0e7d68
> Author: Jens Axboe <jens.axboe@oracle.com>
> Date:   Fri Jun 6 11:18:06 2008 +0200
> smp_call_function: get rid of the unused nonatomic/retry argument
> 
> causes a build error on s390.
>   CC      arch/s390/kernel/time.o
> arch/s390/kernel/time.c: In function 'stp_work_fn':
> arch/s390/kernel/time.c:1448: error: too many arguments to 
> function 'smp_call_function'
> arch/s390/kernel/time.c:1481: error: too many arguments to 
> function 'smp_call_function'
> 
> The fix is simple and obvious, remove the unneeded argument.
> 
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> 
> ---
>  arch/s390/kernel/time.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Index: linux-next/arch/s390/kernel/time.c
> ===================================================================
> --- linux-next.orig/arch/s390/kernel/time.c
> +++ linux-next/arch/s390/kernel/time.c
> @@ -1445,7 +1445,7 @@ static void stp_work_fn(struct work_stru
>  	 */
>  	memset(&stp_sync, 0, sizeof(stp_sync));
>  	preempt_disable();
> -	smp_call_function(clock_sync_cpu_start, &stp_sync, 0, 0);
> +	smp_call_function(clock_sync_cpu_start, &stp_sync, 0);
>  	local_irq_disable();
>  	enable_sync_clock();
> 
> @@ -1478,7 +1478,7 @@ static void stp_work_fn(struct work_stru
>  		stp_sync.in_sync = 1;
> 
>  	local_irq_enable();
> -	smp_call_function(clock_sync_cpu_end, NULL, 0, 0);
> +	smp_call_function(clock_sync_cpu_end, NULL, 0);
>  	preempt_enable();
>  }

Stephen, could you add this patch to your build fixes?
Currently it won't fit into git-s390 or Jens' smp_call_function
tree, since these two call sites are introduced with a new
patch in git-s390 (stp support).

Re: [PATCH linux-next] fix s390 compile error due to smp_call_function

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 445 bytes --]

Hi Heiko,

On Wed, 9 Jul 2008 16:36:39 +0200 Heiko Carstens <heiko.carstens@de.ibm.com> wrote:
>
> Stephen, could you add this patch to your build fixes?
> Currently it won't fit into git-s390 or Jens' smp_call_function
> tree, since these two call sites are introduced with a new
> patch in git-s390 (stp support).

Will do.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]