---

yaml --- r: 99884 b: refs/heads/master c: 6a07a0e h: refs/heads/master v: v3
git-mirror · Jul 8, 2008 · 02b943a · 02b943a
1 parent 0181d3f
commit 02b943a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3eb11edc1321e14a121deeb8b18c177750226eca
+refs/heads/master: 6a07a0edacba397205ff97308b22c6b6aab9f791
diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/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;
 	}