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/avr32/kernel/setup.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/avr32/kernel/setup.c')
-rw-r--r-- | arch/avr32/kernel/setup.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c index 4b4c1884e1c5..e66a07a928cd 100644 --- a/arch/avr32/kernel/setup.c +++ b/arch/avr32/kernel/setup.c | |||
@@ -489,7 +489,8 @@ static void __init setup_bootmem(void) | |||
489 | /* Reserve space for the bootmem bitmap... */ | 489 | /* Reserve space for the bootmem bitmap... */ |
490 | reserve_bootmem_node(NODE_DATA(node), | 490 | reserve_bootmem_node(NODE_DATA(node), |
491 | PFN_PHYS(bootmap_pfn), | 491 | PFN_PHYS(bootmap_pfn), |
492 | bootmap_size); | 492 | bootmap_size, |
493 | BOOTMEM_DEFAULT); | ||
493 | 494 | ||
494 | /* ...and any other reserved regions. */ | 495 | /* ...and any other reserved regions. */ |
495 | for (res = reserved; res; res = res->sibling) { | 496 | for (res = reserved; res; res = res->sibling) { |
@@ -505,7 +506,8 @@ static void __init setup_bootmem(void) | |||
505 | && res->end < PFN_PHYS(max_pfn)) | 506 | && res->end < PFN_PHYS(max_pfn)) |
506 | reserve_bootmem_node( | 507 | reserve_bootmem_node( |
507 | NODE_DATA(node), res->start, | 508 | NODE_DATA(node), res->start, |
508 | res->end - res->start + 1); | 509 | res->end - res->start + 1, |
510 | BOOTMEM_DEFAULT); | ||
509 | } | 511 | } |
510 | 512 | ||
511 | node_set_online(node); | 513 | node_set_online(node); |