diff options
author | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
commit | ea0daab4ae4a2f853f06c76961c0ed324fd0804c (patch) | |
tree | f6fbe2db5772695181b7a7257b05e43343bd8d75 /arch/ia64/kernel/smp.c | |
parent | 58aab753de605c14b9878a897e7349c3063afeff (diff) | |
parent | 1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (diff) |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
Diffstat (limited to 'arch/ia64/kernel/smp.c')
-rw-r--r-- | arch/ia64/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c index 953095e2ce15..b49d4ddaab93 100644 --- a/arch/ia64/kernel/smp.c +++ b/arch/ia64/kernel/smp.c | |||
@@ -269,7 +269,7 @@ smp_call_function_single (int cpuid, void (*func) (void *info), void *info, int | |||
269 | int me = get_cpu(); /* prevent preemption and reschedule on another processor */ | 269 | int me = get_cpu(); /* prevent preemption and reschedule on another processor */ |
270 | 270 | ||
271 | if (cpuid == me) { | 271 | if (cpuid == me) { |
272 | printk("%s: trying to call self\n", __FUNCTION__); | 272 | printk(KERN_INFO "%s: trying to call self\n", __FUNCTION__); |
273 | put_cpu(); | 273 | put_cpu(); |
274 | return -EBUSY; | 274 | return -EBUSY; |
275 | } | 275 | } |