Hi Thomas,
Thomas Chou wrote:
Follow commit 72a7fe3967dbf86cb34e24fbf1d957fe24d2f246,
The 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.
Signed-off-by: Thomas Chou <[EMAIL PROTECTED]>
---
linux-2.6.x/arch/nios2nommu/kernel/setup.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/linux-2.6.x/arch/nios2nommu/kernel/setup.c
b/linux-2.6.x/arch/nios2nommu/kernel/setup.c
index 7fc61d3..934e3a1 100644
--- a/linux-2.6.x/arch/nios2nommu/kernel/setup.c
+++ b/linux-2.6.x/arch/nios2nommu/kernel/setup.c
@@ -324,9 +324,10 @@ void __init setup_arch(char **cmdline_p)
* the bootmem bitmap so we then reserve it after freeing it :-)
*/
free_bootmem(memory_start, memory_end - memory_start);
- reserve_bootmem(memory_start, bootmap_size);
+ reserve_bootmem(memory_start, bootmap_size, BOOTMEM_DEFAULT);
#ifdef CONFIG_BLK_DEV_INITRD
- if (initrd_start) reserve_bootmem(virt_to_phys((void *)initrd_start),
initrd_end - initrd_start);
+ if (initrd_start) reserve_bootmem(virt_to_phys((void *)initrd_start),
initrd_end - initrd_start,
+ BOOTMEM_DEFAULT);
Reported by linux-2.6.x/scripts/checkpatch.pl
ERROR: trailing statements should be on next line
#91: FILE: linux-2.6.x/arch/nios2nommu/kernel/setup.c:329:
+ if (initrd_start) reserve_bootmem(virt_to_phys((void
*)initrd_start), initrd_end - initrd_start,
Regards
Greg
#endif /* CONFIG_BLK_DEV_INITRD */
/*
* get kmalloc into gear
--
------------------------------------------------------------------------
Greg Ungerer -- Chief Software Dude EMAIL: [EMAIL PROTECTED]
Secure Computing Corporation PHONE: +61 7 3435 2888
825 Stanley St, FAX: +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com
_______________________________________________
uClinux-dev mailing list
[email protected]
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by [email protected]
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
