reserve_bootmem_generic in early_res_to_bootmem

reserve_bootmem_generic in early_res_to_bootmem

[Yinghai Lu]

can you make the 64 bit still use reserve_bootmem_generic in
early_res_to_bootmem?

reserve_bootmem_generic is some smart than reserve_bootmem when numa is enabled.

YH

commit 3f3040c347653b93e4e82ee45bb7d41f11c10be8
Author: Ingo Molnar <mingo@elte.hu>
Date:   Mon Jun 9 15:12:20 2008 +0200

    x86: reserve highmem pages via reserve_early, fix #2

    fix:

    arch/x86/kernel/built-in.o: In function `early_res_to_bootmem':
    : undefined reference to `reserve_bootmem_generic'

    Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index a488bd0..68aba41 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -635,7 +635,7 @@ void __init early_res_to_bootmem(u64 start, u64 end)
                        continue;
                printk(KERN_INFO "  early res: %d [%llx-%llx] %s\n", i,
                        final_start, final_end - 1, r->name);
-               reserve_bootmem_generic(final_start, final_end - final_start,
+               reserve_bootmem(final_start, final_end - final_start,
                                BOOTMEM_DEFAULT);
        }
 }

commit df10637c5d57c2c1b42aeb2233e00da9764fd873
Author: Ingo Molnar <mingo@elte.hu>
Date:   Mon Jun 9 15:05:26 2008 +0200

    x86: reserve highmem pages via reserve_early, fix

    fix:

    arch/x86/kernel/e820.c: In function 'early_res_to_bootmem':
    arch/x86/kernel/e820.c:639: error: too few arguments to function
'reserve_bootmem_generic'

    Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index a706e90..a488bd0 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -635,12 +635,8 @@ void __init early_res_to_bootmem(u64 start, u64 end)
                        continue;
                printk(KERN_INFO "  early res: %d [%llx-%llx] %s\n", i,
                        final_start, final_end - 1, r->name);
-#ifdef CONFIG_X86_64
-               reserve_bootmem_generic(final_start, final_end - final_start);
-#else
-               reserve_bootmem(final_start, final_end - final_start,
+               reserve_bootmem_generic(final_start, final_end - final_start,
                                BOOTMEM_DEFAULT);
-#endif
        }
 }

Re: reserve_bootmem_generic in early_res_to_bootmem

[Yinghai Lu]

On Mon, Jun 9, 2008 at 1:07 PM, Yinghai Lu <yhlu.kernel@gmail.com> wrote:
> can you make the 64 bit still use reserve_bootmem_generic in
> early_res_to_bootmem?
>
> reserve_bootmem_generic is some smart than reserve_bootmem when numa is enabled.
>
> YH
>
> commit 3f3040c347653b93e4e82ee45bb7d41f11c10be8
> Author: Ingo Molnar <mingo@elte.hu>
> Date:   Mon Jun 9 15:12:20 2008 +0200
>
>    x86: reserve highmem pages via reserve_early, fix #2
>
>    fix:
>
>    arch/x86/kernel/built-in.o: In function `early_res_to_bootmem':
>    : undefined reference to `reserve_bootmem_generic'
>
>    Signed-off-by: Ingo Molnar <mingo@elte.hu>
>
> diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
> index a488bd0..68aba41 100644
> --- a/arch/x86/kernel/e820.c
> +++ b/arch/x86/kernel/e820.c
> @@ -635,7 +635,7 @@ void __init early_res_to_bootmem(u64 start, u64 end)
>                        continue;
>                printk(KERN_INFO "  early res: %d [%llx-%llx] %s\n", i,
>                        final_start, final_end - 1, r->name);
> -               reserve_bootmem_generic(final_start, final_end - final_start,
> +               reserve_bootmem(final_start, final_end - final_start,
>                                BOOTMEM_DEFAULT);
>        }
>  }
>

or we need add reserve_bootmem_generic for 32 bit?

YH

Re: reserve_bootmem_generic in early_res_to_bootmem

[Ingo Molnar]

* Yinghai Lu <yhlu.kernel@gmail.com> wrote:

> >                printk(KERN_INFO "  early res: %d [%llx-%llx] %s\n", i,
> >                        final_start, final_end - 1, r->name);
> > -               reserve_bootmem_generic(final_start, final_end - final_start,
> > +               reserve_bootmem(final_start, final_end - final_start,
> >                                BOOTMEM_DEFAULT);
> >        }
> >  }
> >
> 
> or we need add reserve_bootmem_generic for 32 bit?

yes, that would be really nice - instead of the ifdeffery.

	Ingo