summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-05-08 16:38:11 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-10 19:31:44 +0200
commit5ecddcebfb7c737fe36494c77bd99ad045eab5ae (patch)
treef4f192db9aa0b7cb6c879ee4886f5bf692ddef92 /arch
parent8d4a4300854f3971502e81dacd930704cb88f606 (diff)
downloadlinux-5ecddcebfb7c737fe36494c77bd99ad045eab5ae.tar.bz2
x86: revert printk format warning change which is for linux-next
commit 62179849b40aded9e727cca5006627a1c4d6446e x86: fix setup printk format warning is for linux-next and not for .26 Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index cc6f5eb20b24..c0c68c18a788 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -95,7 +95,7 @@ void __init setup_per_cpu_areas(void)
/* Copy section for each CPU (we discard the original) */
size = PERCPU_ENOUGH_ROOM;
- printk(KERN_INFO "PERCPU: Allocating %zd bytes of per cpu data\n",
+ printk(KERN_INFO "PERCPU: Allocating %lu bytes of per cpu data\n",
size);
for_each_possible_cpu(i) {