summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-15 22:08:52 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-15 22:08:52 +0200
commitf6f88e9bfb6ced9871ed65ebe85c371de3c9e4be (patch)
treefec0def5fed9ab79340a04184bc4d48ac2b832ce /arch/s390
parentb3c9816b9fa9a7b75ab36111eb76eca03e5bab78 (diff)
downloadop-kernel-dev-f6f88e9bfb6ced9871ed65ebe85c371de3c9e4be.zip
op-kernel-dev-f6f88e9bfb6ced9871ed65ebe85c371de3c9e4be.tar.gz
generic-ipi: more merge fallout
fix more API change fallout in recently merged upstream changes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 8051e93..f2cede3 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -1432,7 +1432,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();
@@ -1465,7 +1465,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();
}
OpenPOWER on IntegriCloud