summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/smp.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-05 09:25:53 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-05 09:25:53 -0800
commit2cfae2739bda8fc5d934977c0ab19f6df1dd6d6c (patch)
treeafe1107cd252595a8d99c292c9f68ee1b5d15364 /arch/sparc64/kernel/smp.c
parent97bd7919e2c1445dabbcc2686795dbb52316b923 (diff)
parent9cb1200a286799db897e81bc2b2c1730cfdc9c08 (diff)
downloadlinux-2cfae2739bda8fc5d934977c0ab19f6df1dd6d6c.tar.gz
linux-2cfae2739bda8fc5d934977c0ab19f6df1dd6d6c.tar.bz2
linux-2cfae2739bda8fc5d934977c0ab19f6df1dd6d6c.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Update defconfig. [SPARC]: Add missing of_node_put [SPARC64]: check for possible NULL pointer dereference [SPARC]: Add missing "space" [SPARC64]: Add missing "space" [SPARC64]: Add missing pci_dev_put [SYSCTL_CHECK]: Fix typo in KERN_SPARC_SCONS_PWROFF entry string. [SPARC64]: Missing mdesc_release() in ldc_init().
Diffstat (limited to 'arch/sparc64/kernel/smp.c')
-rw-r--r--arch/sparc64/kernel/smp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 7cd8d94df0dc..894b506f9636 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -236,8 +236,9 @@ void smp_synchronize_tick_client(void)
t[i].rt, t[i].master, t[i].diff, t[i].lat);
#endif
- printk(KERN_INFO "CPU %d: synchronized TICK with master CPU (last diff %ld cycles,"
- "maxerr %lu cycles)\n", smp_processor_id(), delta, rt);
+ printk(KERN_INFO "CPU %d: synchronized TICK with master CPU "
+ "(last diff %ld cycles, maxerr %lu cycles)\n",
+ smp_processor_id(), delta, rt);
}
static void smp_start_sync_tick_client(int cpu);