From 6a07a0edacba397205ff97308b22c6b6aab9f791 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Mon, 23 Jun 2008 14:02:36 -0700 Subject: [PATCH] x86: fix compile warning in init_64.c len is long and ret is only for NUMA Signed-off-by: Yinghai Lu Signed-off-by: Ingo Molnar --- arch/x86/mm/init_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 955dbc8abf..54a98407be 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; } -- 2.39.5