diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-16 13:11:29 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-16 13:11:29 +0200 |
commit | 77e442461c74068217b59b356cf18992c78ed896 (patch) | |
tree | 70f62a16bc6a81b63768279c9b40645d8f4dd4ff /arch/ia64/kernel/palinfo.c | |
parent | d54191b85e294c46f05a2249b1f55ae54930bcc7 (diff) | |
parent | 45158894d4d6704afbb4cefe55e5f6ca279fe12a (diff) | |
download | talos-op-linux-77e442461c74068217b59b356cf18992c78ed896.tar.gz talos-op-linux-77e442461c74068217b59b356cf18992c78ed896.zip |
Merge branch 'linus' into x86/kprobes
Diffstat (limited to 'arch/ia64/kernel/palinfo.c')
-rw-r--r-- | arch/ia64/kernel/palinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c index 9dc00f7fe10e..e5c57f413ca2 100644 --- a/arch/ia64/kernel/palinfo.c +++ b/arch/ia64/kernel/palinfo.c @@ -921,7 +921,7 @@ int palinfo_handle_smp(pal_func_cpu_u_t *f, char *page) /* will send IPI to other CPU and wait for completion of remote call */ - if ((ret=smp_call_function_single(f->req_cpu, palinfo_smp_call, &ptr, 0, 1))) { + if ((ret=smp_call_function_single(f->req_cpu, palinfo_smp_call, &ptr, 1))) { printk(KERN_ERR "palinfo: remote CPU call from %d to %d on function %d: " "error %d\n", smp_processor_id(), f->req_cpu, f->func_id, ret); return 0; |