diff options
author | Bernhard Walle <bwalle@suse.de> | 2008-02-07 03:15:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 11:42:25 -0500 |
commit | 72a7fe3967dbf86cb34e24fbf1d957fe24d2f246 (patch) | |
tree | c19f7d0b530577359840e959cce204939caf0649 /arch/arm/mm/init.c | |
parent | 25fad945a7f7ff2cf06e437381c6a1121784dbd9 (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/arm/mm/init.c')
-rw-r--r-- | arch/arm/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index c0ad7c0fbae0..ec00f26bffa4 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
@@ -239,7 +239,7 @@ bootmem_init_node(int node, int initrd_node, struct meminfo *mi) | |||
239 | * Reserve the bootmem bitmap for this node. | 239 | * Reserve the bootmem bitmap for this node. |
240 | */ | 240 | */ |
241 | reserve_bootmem_node(pgdat, boot_pfn << PAGE_SHIFT, | 241 | reserve_bootmem_node(pgdat, boot_pfn << PAGE_SHIFT, |
242 | boot_pages << PAGE_SHIFT); | 242 | boot_pages << PAGE_SHIFT, BOOTMEM_DEFAULT); |
243 | 243 | ||
244 | #ifdef CONFIG_BLK_DEV_INITRD | 244 | #ifdef CONFIG_BLK_DEV_INITRD |
245 | /* | 245 | /* |
@@ -247,7 +247,7 @@ bootmem_init_node(int node, int initrd_node, struct meminfo *mi) | |||
247 | */ | 247 | */ |
248 | if (node == initrd_node) { | 248 | if (node == initrd_node) { |
249 | reserve_bootmem_node(pgdat, phys_initrd_start, | 249 | reserve_bootmem_node(pgdat, phys_initrd_start, |
250 | phys_initrd_size); | 250 | phys_initrd_size, BOOTMEM_DEFAULT); |
251 | initrd_start = __phys_to_virt(phys_initrd_start); | 251 | initrd_start = __phys_to_virt(phys_initrd_start); |
252 | initrd_end = initrd_start + phys_initrd_size; | 252 | initrd_end = initrd_start + phys_initrd_size; |
253 | } | 253 | } |