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/mips/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/mips/kernel/setup.c')
-rw-r--r-- | arch/mips/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index c032409cba9b..39f3dfe134fb 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c | |||
@@ -232,7 +232,7 @@ static void __init finalize_initrd(void) | |||
232 | goto disable; | 232 | goto disable; |
233 | } | 233 | } |
234 | 234 | ||
235 | reserve_bootmem(__pa(initrd_start), size); | 235 | reserve_bootmem(__pa(initrd_start), size, BOOTMEM_DEFAULT); |
236 | initrd_below_start_ok = 1; | 236 | initrd_below_start_ok = 1; |
237 | 237 | ||
238 | printk(KERN_INFO "Initial ramdisk at: 0x%lx (%lu bytes)\n", | 238 | printk(KERN_INFO "Initial ramdisk at: 0x%lx (%lu bytes)\n", |
@@ -413,7 +413,7 @@ static void __init bootmem_init(void) | |||
413 | /* | 413 | /* |
414 | * Reserve the bootmap memory. | 414 | * Reserve the bootmap memory. |
415 | */ | 415 | */ |
416 | reserve_bootmem(PFN_PHYS(mapstart), bootmap_size); | 416 | reserve_bootmem(PFN_PHYS(mapstart), bootmap_size, BOOTMEM_DEFAULT); |
417 | 417 | ||
418 | /* | 418 | /* |
419 | * Reserve initrd memory if needed. | 419 | * Reserve initrd memory if needed. |