From 02069ca3e0ff21339a83204391d558574faf5f6e Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Fri, 2 May 2008 13:32:35 -0700
Subject: [PATCH] --- yaml --- r: 95994 b: refs/heads/master c:
 62179849b40aded9e727cca5006627a1c4d6446e h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/x86/kernel/setup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7c2137b735b8..ff07a9039ec7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e26a28d190304d910ee49b81cbfe6d9241f56e86
+refs/heads/master: 62179849b40aded9e727cca5006627a1c4d6446e
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index c0c68c18a788..cc6f5eb20b24 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/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 %lu bytes of per cpu data\n",
+	printk(KERN_INFO "PERCPU: Allocating %zd bytes of per cpu data\n",
 			  size);
 
 	for_each_possible_cpu(i) {