Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a07a0ed authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: fix compile warning in init_64.c 



len is long and ret is only for NUMA

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3eb11edc

arch/x86/mm/init_64.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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;

	}

	}