aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 11:02:55 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 11:02:55 -0800
commit581548db3b3c0f6e25b500329eb02e3c72e7acbe (patch)
tree09b5633ee5432d2c8f1d56b8d7abb7a2f41337d0 /arch/ia64
parent03a4491f5d6835028dbbcf36990599c5c9f6ff55 (diff)
parentdff0092bcdb7b21ba2e862fed7c92e79dfb26806 (diff)
downloadlinux-2.6.38-lt-ux500-581548db3b3c0f6e25b500329eb02e3c72e7acbe.tar.gz
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Fix format warning in arch/ia64/kernel/acpi.c
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/acpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 7b897b7b0ae..90ebceb899a 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -479,7 +479,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
if (srat_num_cpus >= ARRAY_SIZE(node_cpuid)) {
printk_once(KERN_WARNING
- "node_cpuid[%d] is too small, may not be able to use all cpus\n",
+ "node_cpuid[%ld] is too small, may not be able to use all cpus\n",
ARRAY_SIZE(node_cpuid));
return;
}