浏览代码

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>
Yinghai Lu 17 年之前
父节点
当前提交
6a07a0edac
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      arch/x86/mm/init_64.c

+ 2 - 2
arch/x86/mm/init_64.c

@@ -830,9 +830,9 @@ int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
 {
 {
 #ifdef CONFIG_NUMA
 #ifdef CONFIG_NUMA
 	int nid, next_nid;
 	int nid, next_nid;
+	int ret;
 #endif
 #endif
 	unsigned long pfn = phys >> PAGE_SHIFT;
 	unsigned long pfn = phys >> PAGE_SHIFT;
-	int ret;
 
 
 	if (pfn >= end_pfn) {
 	if (pfn >= end_pfn) {
 		/*
 		/*
@@ -842,7 +842,7 @@ int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
 		if (pfn < max_pfn_mapped)
 		if (pfn < max_pfn_mapped)
 			return -EFAULT;
 			return -EFAULT;
 
 
-		printk(KERN_ERR "reserve_bootmem: illegal reserve %lx %u\n",
+		printk(KERN_ERR "reserve_bootmem: illegal reserve %lx %lu\n",
 				phys, len);
 				phys, len);
 		return -EFAULT;
 		return -EFAULT;
 	}
 	}