diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-23 14:02:36 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:50:23 +0200 |
| commit | 6a07a0edacba397205ff97308b22c6b6aab9f791 (patch) | |
| tree | 32a8656b75d20058c9ecccc20ab8410149fe5875 /arch | |
| parent | 3eb11edc1321e14a121deeb8b18c177750226eca (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')
| -rw-r--r-- | arch/x86/mm/init_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |