From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Mon, 23 Jun 2008 21:02:36 +0000 (-0700)
Subject: x86: fix compile warning in init_64.c
X-Git-Tag: v2.6.27-rc1~1106^2~202
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6a07a0edacba397205ff97308b22c6b6aab9f791;p=linux-2.6-omap-h63xx.git

x86: fix compile warning in init_64.c

len is long and ret is only for NUMA

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 955dbc8abf6..54a98407be3 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -830,9 +830,9 @@ int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
 {
 #ifdef CONFIG_NUMA
 	int nid, next_nid;
+	int ret;
 #endif
 	unsigned long pfn = phys >> PAGE_SHIFT;
-	int ret;
 
 	if (pfn >= end_pfn) {
 		/*
@@ -842,7 +842,7 @@ int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
 		if (pfn < max_pfn_mapped)
 			return -EFAULT;
 
-		printk(KERN_ERR "reserve_bootmem: illegal reserve %lx %u\n",
+		printk(KERN_ERR "reserve_bootmem: illegal reserve %lx %lu\n",
 				phys, len);
 		return -EFAULT;
 	}