Introduce flags for reserve_bootmem()
This patchset adds a flags variable to reserve_bootmem() and uses the BOOTMEM_EXCLUSIVE flag in crashkernel reservation code to detect collisions between crashkernel area and already used memory. This patch: Change the reserve_bootmem() function to accept a new flag BOOTMEM_EXCLUSIVE. If that flag is set, the function returns with -EBUSY if the memory already has been reserved in the past. This is to avoid conflicts. Because that code runs before SMP initialisation, there's no race condition inside reserve_bootmem_core(). [akpm@linux-foundation.org: coding-style fixes] [akpm@linux-foundation.org: fix powerpc build] Signed-off-by: Bernhard Walle <bwalle@suse.de> Cc: <linux-arch@vger.kernel.org> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Vivek Goyal <vgoyal@in.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
25fad945a7
commit
72a7fe3967
@@ -91,7 +91,8 @@ unsigned long __init setup_memory(void)
|
||||
PFN_PHYS(mp->pages));
|
||||
|
||||
reserve_bootmem_node(NODE_DATA(nid), PFN_PHYS(mp->start_pfn),
|
||||
PFN_PHYS(mp->free_pfn - mp->start_pfn) + bootmap_size);
|
||||
PFN_PHYS(mp->free_pfn - mp->start_pfn) + bootmap_size,
|
||||
BOOTMEM_DEFAULT);
|
||||
|
||||
if (max_low_pfn < max_pfn)
|
||||
max_low_pfn = max_pfn;
|
||||
@@ -104,7 +105,7 @@ unsigned long __init setup_memory(void)
|
||||
if (LOADER_TYPE && INITRD_START) {
|
||||
if (INITRD_START + INITRD_SIZE <= PFN_PHYS(max_low_pfn)) {
|
||||
reserve_bootmem_node(NODE_DATA(0), INITRD_START,
|
||||
INITRD_SIZE);
|
||||
INITRD_SIZE, BOOTMEM_DEFAULT);
|
||||
initrd_start = INITRD_START + PAGE_OFFSET;
|
||||
initrd_end = initrd_start + INITRD_SIZE;
|
||||
printk("initrd:start[%08lx],size[%08lx]\n",
|
||||
|
Reference in New Issue
Block a user