aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/mm
diff options
context:
space:
mode:
authorBernhard Walle <bwalle@suse.de>2008-02-07 03:15:17 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 11:42:25 -0500
commit72a7fe3967dbf86cb34e24fbf1d957fe24d2f246 (patch)
treec19f7d0b530577359840e959cce204939caf0649 /arch/ia64/mm
parent25fad945a7f7ff2cf06e437381c6a1121784dbd9 (diff)
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>
Diffstat (limited to 'arch/ia64/mm')
-rw-r--r--arch/ia64/mm/contig.c2
-rw-r--r--arch/ia64/mm/discontig.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 7e9c275ea148..344f64eca7a9 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -218,7 +218,7 @@ find_memory (void)
218 218
219 /* Free all available memory, then mark bootmem-map as being in use. */ 219 /* Free all available memory, then mark bootmem-map as being in use. */
220 efi_memmap_walk(filter_rsvd_memory, free_bootmem); 220 efi_memmap_walk(filter_rsvd_memory, free_bootmem);
221 reserve_bootmem(bootmap_start, bootmap_size); 221 reserve_bootmem(bootmap_start, bootmap_size, BOOTMEM_DEFAULT);
222 222
223 find_initrd(); 223 find_initrd();
224 224
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 0b567398f38e..ee5e68b2af94 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -299,12 +299,12 @@ static void __init reserve_pernode_space(void)
299 pages = bdp->node_low_pfn - (bdp->node_boot_start>>PAGE_SHIFT); 299 pages = bdp->node_low_pfn - (bdp->node_boot_start>>PAGE_SHIFT);
300 size = bootmem_bootmap_pages(pages) << PAGE_SHIFT; 300 size = bootmem_bootmap_pages(pages) << PAGE_SHIFT;
301 base = __pa(bdp->node_bootmem_map); 301 base = __pa(bdp->node_bootmem_map);
302 reserve_bootmem_node(pdp, base, size); 302 reserve_bootmem_node(pdp, base, size, BOOTMEM_DEFAULT);
303 303
304 /* Now the per-node space */ 304 /* Now the per-node space */
305 size = mem_data[node].pernode_size; 305 size = mem_data[node].pernode_size;
306 base = __pa(mem_data[node].pernode_addr); 306 base = __pa(mem_data[node].pernode_addr);
307 reserve_bootmem_node(pdp, base, size); 307 reserve_bootmem_node(pdp, base, size, BOOTMEM_DEFAULT);
308 } 308 }
309} 309}
310 310