On Thu, 2010-07-22 at 11:43 -0700, Yinghai Lu wrote:
> It will be used memblock_x86_to_bootmem converting
The above doesn't make much sense.
Appart from that, no objection.
Ben.
> It is an wrapper for reserve_bootmem, and x86 64bit is using special one.
>
> Also clean up that version for x86_64. We don't need to take care of numa
> path for that, bootmem can handle it how
>
> Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
> ---
> arch/x86/mm/init_32.c | 6 ------
> arch/x86/mm/init_64.c | 20 ++------------------
> mm/bootmem.c | 6 ++++++
> 3 files changed, 8 insertions(+), 24 deletions(-)
>
> diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
> index bca7909..90e0545 100644
> --- a/arch/x86/mm/init_32.c
> +++ b/arch/x86/mm/init_32.c
> @@ -1069,9 +1069,3 @@ void mark_rodata_ro(void)
> #endif
> }
> #endif
> -
> -int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
> - int flags)
> -{
> - return reserve_bootmem(phys, len, flags);
> -}
> diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
> index ee41bba..634fa08 100644
> --- a/arch/x86/mm/init_64.c
> +++ b/arch/x86/mm/init_64.c
> @@ -799,13 +799,10 @@ void mark_rodata_ro(void)
>
> #endif
>
> +#ifndef CONFIG_NO_BOOTMEM
> int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
> int flags)
> {
> -#ifdef CONFIG_NUMA
> - int nid, next_nid;
> - int ret;
> -#endif
> unsigned long pfn = phys >> PAGE_SHIFT;
>
> if (pfn >= max_pfn) {
> @@ -821,21 +818,7 @@ int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
> return -EFAULT;
> }
>
> - /* Should check here against the e820 map to avoid double free */
> -#ifdef CONFIG_NUMA
> - nid = phys_to_nid(phys);
> - next_nid = phys_to_nid(phys + len - 1);
> - if (nid == next_nid)
> - ret = reserve_bootmem_node(NODE_DATA(nid), phys, len, flags);
> - else
> - ret = reserve_bootmem(phys, len, flags);
> -
> - if (ret != 0)
> - return ret;
> -
> -#else
> reserve_bootmem(phys, len, flags);
> -#endif
>
> if (phys+len <= MAX_DMA_PFN*PAGE_SIZE) {
> dma_reserve += len / PAGE_SIZE;
> @@ -844,6 +827,7 @@ int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
>
> return 0;
> }
> +#endif
>
> int kern_addr_valid(unsigned long addr)
> {
> diff --git a/mm/bootmem.c b/mm/bootmem.c
> index 142c84a..bde170d 100644
> --- a/mm/bootmem.c
> +++ b/mm/bootmem.c
> @@ -526,6 +526,12 @@ int __init reserve_bootmem(unsigned long addr, unsigned long size,
> }
>
> #ifndef CONFIG_NO_BOOTMEM
> +int __weak __init reserve_bootmem_generic(unsigned long phys, unsigned long len,
> + int flags)
> +{
> + return reserve_bootmem(phys, len, flags);
> +}
> +
> static unsigned long __init align_idx(struct bootmem_data *bdata,
> unsigned long idx, unsigned long step)
> {
--
To unsubscribe from this list: send the line "unsubscribe linux-arch" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
