aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/smp_32.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-13 20:26:50 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-13 20:26:50 -0400
commit13b102bf48d39d84d87bee31544f4588502649b6 (patch)
treec51846d0ca82ed2b7c01f52925c1cd56e1802ce7 /arch/sparc/kernel/smp_32.c
parent81c02a21b293faecab725f691d709111831e1944 (diff)
parent8bccf5b313180faefce38e0d1140f76e0f327d28 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull Sparc fixes from David Miller: "Sparc bug fixes, one of which was preventing successful SMP boots with mainline" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: Fix pcr_ops initialization and usage bugs. sparc64: Do not disable interrupts in nmi_cpu_busy() sparc: Hook up seccomp and getrandom system calls. sparc: fix decimal printf format specifiers prefixed with 0x
Diffstat (limited to 'arch/sparc/kernel/smp_32.c')
-rw-r--r--arch/sparc/kernel/smp_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/smp_32.c b/arch/sparc/kernel/smp_32.c
index 7958242d63c5..b3a5d81b20f0 100644
--- a/arch/sparc/kernel/smp_32.c
+++ b/arch/sparc/kernel/smp_32.c
@@ -68,7 +68,7 @@ void smp_store_cpu_info(int id)
68 mid = cpu_get_hwmid(cpu_node); 68 mid = cpu_get_hwmid(cpu_node);
69 69
70 if (mid < 0) { 70 if (mid < 0) {
71 printk(KERN_NOTICE "No MID found for CPU%d at node 0x%08d", id, cpu_node); 71 printk(KERN_NOTICE "No MID found for CPU%d at node 0x%08x", id, cpu_node);
72 mid = 0; 72 mid = 0;
73 } 73 }
74 cpu_data(id).mid = mid; 74 cpu_data(id).mid = mid;