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/nommu.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/nommu.c')
-rw-r--r-- | arch/arm/mm/nommu.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index 8cd3a60954f0..63c62fdea521 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c | |||
@@ -27,9 +27,11 @@ void __init reserve_node_zero(pg_data_t *pgdat) | |||
27 | * Note that this can only be in node 0. | 27 | * Note that this can only be in node 0. |
28 | */ | 28 | */ |
29 | #ifdef CONFIG_XIP_KERNEL | 29 | #ifdef CONFIG_XIP_KERNEL |
30 | reserve_bootmem_node(pgdat, __pa(&__data_start), &_end - &__data_start); | 30 | reserve_bootmem_node(pgdat, __pa(&__data_start), &_end - &__data_start, |
31 | BOOTMEM_DEFAULT); | ||
31 | #else | 32 | #else |
32 | reserve_bootmem_node(pgdat, __pa(&_stext), &_end - &_stext); | 33 | reserve_bootmem_node(pgdat, __pa(&_stext), &_end - &_stext, |
34 | BOOTMEM_DEFAULT); | ||
33 | #endif | 35 | #endif |
34 | 36 | ||
35 | /* | 37 | /* |
@@ -37,7 +39,8 @@ void __init reserve_node_zero(pg_data_t *pgdat) | |||
37 | * some architectures which the DRAM is the exception vector to trap, | 39 | * some architectures which the DRAM is the exception vector to trap, |
38 | * alloc_page breaks with error, although it is not NULL, but "0." | 40 | * alloc_page breaks with error, although it is not NULL, but "0." |
39 | */ | 41 | */ |
40 | reserve_bootmem_node(pgdat, CONFIG_VECTORS_BASE, PAGE_SIZE); | 42 | reserve_bootmem_node(pgdat, CONFIG_VECTORS_BASE, PAGE_SIZE, |
43 | BOOTMEM_DEFAULT); | ||
41 | } | 44 | } |
42 | 45 | ||
43 | /* | 46 | /* |