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

Commit 3fd052b1 authored by Bernhard Walle's avatar Bernhard Walle Committed by Ingo Molnar
Browse files

x86: add flags parameter to reserve_bootmem_generic() 



This patch adds a 'flags' parameter to reserve_bootmem_generic() like it
already has been added in reserve_bootmem() with commit
72a7fe39.

It also changes all users to use BOOTMEM_DEFAULT, which doesn't effectively
change the behaviour. Since the change is x86-specific, I don't think it's
necessary to add a new API for migration. There are only 4 users of that
function.

The change is necessary for the next patch, using reserve_bootmem_generic()
for crashkernel reservation.

Signed-off-by: default avatarBernhard Walle <bwalle@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 053713f5

arch/x86/kernel/e820_64.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -118,7 +118,8 @@ void __init early_res_to_bootmem(unsigned long start, unsigned long end) 
			continue;

			continue;

		printk(KERN_INFO "  early res: %d [%lx-%lx] %s\n", i,

		printk(KERN_INFO "  early res: %d [%lx-%lx] %s\n", i,

			final_start, final_end - 1, r->name);

			final_start, final_end - 1, r->name);

		reserve_bootmem_generic(final_start, final_end - final_start);

		reserve_bootmem_generic(final_start, final_end - final_start,

				BOOTMEM_DEFAULT);

	}

	}

}

}

arch/x86/kernel/efi_64.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -100,7 +100,8 @@ void __init efi_call_phys_epilog(void) 
void __init efi_reserve_bootmem(void)

void __init efi_reserve_bootmem(void)

{

{

	reserve_bootmem_generic((unsigned long)memmap.phys_map,

	reserve_bootmem_generic((unsigned long)memmap.phys_map,

				memmap.nr_map * memmap.desc_size);

				memmap.nr_map * memmap.desc_size,

				BOOTMEM_DEFAULT);

}

}





void __iomem * __init efi_ioremap(unsigned long phys_addr, unsigned long size)

void __iomem * __init efi_ioremap(unsigned long phys_addr, unsigned long size)

arch/x86/kernel/mpparse.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -729,10 +729,11 @@ static int __init smp_scan_config(unsigned long base, unsigned long length, 
			if (!reserve)

			if (!reserve)

				return 1;

				return 1;





			reserve_bootmem_generic(virt_to_phys(mpf), PAGE_SIZE);

			reserve_bootmem_generic(virt_to_phys(mpf), PAGE_SIZE,

				BOOTMEM_DEFAULT);

			if (mpf->mpf_physptr)

			if (mpf->mpf_physptr)

				reserve_bootmem_generic(mpf->mpf_physptr,

				reserve_bootmem_generic(mpf->mpf_physptr,

							PAGE_SIZE);

					PAGE_SIZE, BOOTMEM_DEFAULT);

#endif

#endif

		return 1;

		return 1;

		}

		}

arch/x86/mm/init_64.c

+12 −5
Original line number Original line Diff line number Diff line
@@ -799,12 +799,13 @@ void free_initrd_mem(unsigned long start, unsigned long end) 
}

}

#endif

#endif





void __init reserve_bootmem_generic(unsigned long phys, unsigned len)

int __init reserve_bootmem_generic(unsigned long phys, unsigned len, int flags)

{

{

#ifdef CONFIG_NUMA

#ifdef CONFIG_NUMA

	int nid, next_nid;

	int nid, next_nid;

#endif

#endif

	unsigned long pfn = phys >> PAGE_SHIFT;

	unsigned long pfn = phys >> PAGE_SHIFT;

	int ret;





	if (pfn >= end_pfn) {

	if (pfn >= end_pfn) {

		/*

		/*
@@ -812,11 +813,11 @@ void __init reserve_bootmem_generic(unsigned long phys, unsigned len) 
		 * firmware tables:

		 * firmware tables:

		 */

		 */

		if (pfn < max_pfn_mapped)

		if (pfn < max_pfn_mapped)

			return;

			return -EFAULT;





		printk(KERN_ERR "reserve_bootmem: illegal reserve %lx %u\n",

		printk(KERN_ERR "reserve_bootmem: illegal reserve %lx %u\n",

				phys, len);

				phys, len);

		return;

		return -EFAULT;

	}

	}





	/* Should check here against the e820 map to avoid double free */

	/* Should check here against the e820 map to avoid double free */
@@ -824,9 +825,13 @@ void __init reserve_bootmem_generic(unsigned long phys, unsigned len) 
	nid = phys_to_nid(phys);

	nid = phys_to_nid(phys);

	next_nid = phys_to_nid(phys + len - 1);

	next_nid = phys_to_nid(phys + len - 1);

	if (nid == next_nid)

	if (nid == next_nid)

		reserve_bootmem_node(NODE_DATA(nid), phys, len, BOOTMEM_DEFAULT);

		ret = reserve_bootmem_node(NODE_DATA(nid), phys, len, flags);

	else

	else

		reserve_bootmem(phys, len, BOOTMEM_DEFAULT);

		ret = reserve_bootmem(phys, len, flags);



	if (ret != 0)

		return ret;



#else

#else

	reserve_bootmem(phys, len, BOOTMEM_DEFAULT);

	reserve_bootmem(phys, len, BOOTMEM_DEFAULT);

#endif

#endif
@@ -835,6 +840,8 @@ void __init reserve_bootmem_generic(unsigned long phys, unsigned len) 
		dma_reserve += len / PAGE_SIZE;

		dma_reserve += len / PAGE_SIZE;

		set_dma_reserve(dma_reserve);

		set_dma_reserve(dma_reserve);

	}

	}



	return 0;

}

}





int kern_addr_valid(unsigned long addr)

int kern_addr_valid(unsigned long addr)

include/asm-x86/proto.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ extern void ia32_syscall(void); 
extern void ia32_cstar_target(void);

extern void ia32_cstar_target(void);

extern void ia32_sysenter_target(void);

extern void ia32_sysenter_target(void);





extern void reserve_bootmem_generic(unsigned long phys, unsigned len);

extern int reserve_bootmem_generic(unsigned long phys, unsigned len, int flags);





extern void syscall32_cpu_init(void);

extern void syscall32_cpu_init(void);