diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2008-07-08 16:25:50 +0200 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-11 17:32:34 +1000 |
| commit | ffd28b6a6ef06d74661cdaea0868d20baa4fa693 (patch) | |
| tree | 6c5ef5dfdb1d6f8c4ef0630d1b653b20c914c4b1 | |
| parent | 47837bf135523e28d99c57bd9b9ca698cdc11f96 (diff) | |
s390: fix compile error due to smp_call_function
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>
| -rw-r--r-- | arch/s390/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index 481f1366949e..8b08828bbbe8 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -1445,7 +1445,7 @@ static void stp_work_fn(struct work_struct *work) */ 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_struct *work) 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(); } |