On Sun, Jun 08, 2008 at 03:46:30PM +0200, Bernhard Walle wrote: >This patch adds a 'flags' parameter to reserve_bootmem_generic() like it >already has been added in reserve_bootmem() with commit >72a7fe3967dbf86cb34e24fbf1d957fe24d2f246. > >It also changes all users to use BOOTMEM_DEFAULT, which doesn't effectively >change the behaviour. Since the change is x86-specific, I don't think it's >necessary to add a new API for migration. There are only 4 users of that >function. > >The change is necessary for the next patch, using reserve_bootmem_generic() >for crashkernel reservation. > > >Signed-off-by: Bernhard Walle <bwalle at suse.de> > >--- > arch/x86/kernel/e820_64.c | 3 ++- > arch/x86/kernel/efi_64.c | 3 ++- > arch/x86/kernel/mpparse.c | 5 +++-- > arch/x86/mm/init_64.c | 17 ++++++++++++----- > include/asm-x86/proto.h | 2 +- > 5 files changed, 20 insertions(+), 10 deletions(-) > >--- a/arch/x86/kernel/e820_64.c >+++ b/arch/x86/kernel/e820_64.c >@@ -118,7 +118,8 @@ void __init early_res_to_bootmem(unsigne > continue; > printk(KERN_INFO " early res: %d [%lx-%lx] %s\n", i, > final_start, final_end - 1, r->name); >- reserve_bootmem_generic(final_start, final_end - final_start); >+ reserve_bootmem_generic(final_start, final_end - final_start, >+ BOOTMEM_DEFAULT); > } > } > >--- a/arch/x86/kernel/efi_64.c >+++ b/arch/x86/kernel/efi_64.c >@@ -100,7 +100,8 @@ void __init efi_call_phys_epilog(void) > void __init efi_reserve_bootmem(void) > { > reserve_bootmem_generic((unsigned long)memmap.phys_map, >- memmap.nr_map * memmap.desc_size); >+ memmap.nr_map * memmap.desc_size, >+ BOOTMEM_DEFAULT); > } Just one comment. Since 'reserve_bootmem_generic' is changed from 'void' to 'int', we should check its return value for failure when possible, right? -- Hi, I'm a .signature virus, please copy/paste me to help me spread all over the world.