x86: fix compile warning in init_64.c

len is long and ret is only for NUMA

Signed-off-by: Yinghai Lu <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 955dbc8abf6abc4e6bc6c73599840d82f7ae4d92..54a98407be3fea205cc8e2ff59b069e33f0b0c72 100644 (file)
--- 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;
        }