From d837f1f0d1787a7418ddbddc12a9121c4136251d Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 2 Nov 2005 21:54:14 +0000 Subject: [PATCH] --- yaml --- r: 12175 b: refs/heads/master c: 273c2cdb2b6d6743d85ddbde82e71f8adbf5bf10 h: refs/heads/master i: 12173: 2ad998979b162961e6cc5c3486737bf3a3b7c8a2 12171: a1cae74894103c137adbbb13a90dbda9832e5f71 12167: 99661ed221ed0074640b6f4172a522f374c5a266 12159: c81bf7b30e6e42676323e86d4ec4582d44b74b15 v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/smp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3678f2b4b4c4..e5f2df65015e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71f512e89704f5aa6fc0b97e4a719184080b8938 +refs/heads/master: 273c2cdb2b6d6743d85ddbde82e71f8adbf5bf10 diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c index 45877f5d5717..b40915dcd533 100644 --- a/trunk/arch/arm/kernel/smp.c +++ b/trunk/arch/arm/kernel/smp.c @@ -315,8 +315,8 @@ int smp_call_function_on_cpu(void (*func)(void *info), void *info, int retry, printk(KERN_CRIT "CPU%u: smp_call_function timeout for %p(%p)\n" " callmap %lx pending %lx, %swait\n", - smp_processor_id(), func, info, callmap, data.pending, - wait ? "" : "no "); + smp_processor_id(), func, info, *cpus_addr(callmap), + *cpus_addr(data.pending), wait ? "" : "no "); /* * TRACE