aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/init_64.c
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-23 17:02:36 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-08 06:50:23 -0400
commit6a07a0edacba397205ff97308b22c6b6aab9f791 (patch)
tree32a8656b75d20058c9ecccc20ab8410149fe5875 /arch/x86/mm/init_64.c
parent3eb11edc1321e14a121deeb8b18c177750226eca (diff)
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>
Diffstat (limited to 'arch/x86/mm/init_64.c')
-rw-r--r--arch/x86/mm/init_64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 955dbc8abf6a..54a98407be3f 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,
830{ 830{
831#ifdef CONFIG_NUMA 831#ifdef CONFIG_NUMA
832 int nid, next_nid; 832 int nid, next_nid;
833 int ret;
833#endif 834#endif
834 unsigned long pfn = phys >> PAGE_SHIFT; 835 unsigned long pfn = phys >> PAGE_SHIFT;
835 int ret;
836 836
837 if (pfn >= end_pfn) { 837 if (pfn >= end_pfn) {
838 /* 838 /*
@@ -842,7 +842,7 @@ int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
842 if (pfn < max_pfn_mapped) 842 if (pfn < max_pfn_mapped)
843 return -EFAULT; 843 return -EFAULT;
844 844
845 printk(KERN_ERR "reserve_bootmem: illegal reserve %lx %u\n", 845 printk(KERN_ERR "reserve_bootmem: illegal reserve %lx %lu\n",
846 phys, len); 846 phys, len);
847 return -EFAULT; 847 return -EFAULT;
848 } 848 }