[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090601131035.GB1422@wotan.suse.de>
Date: Mon, 1 Jun 2009 15:10:35 +0200
From: Nick Piggin <npiggin@...e.de>
To: Yinghai Lu <yinghai@...nel.org>
Cc: Pekka Enberg <penberg@...helsinki.fi>, mingo@...e.hu,
cl@...ux-foundation.com, torvals@...ux-foundation.org,
mpm@...enic.com, linux-kernel@...r.kernel.org
Subject: Re: Subject: [PATCH] slab: remove bootmem calling
On Thu, May 28, 2009 at 06:10:05PM -0700, Yinghai Lu wrote:
> mem_init/kmem_cache_init is moved up
Is there a way we could start documenting/improving these
dependencies of bootup stuff? A comment with depends/provides
lines?
>
> Signed-off-by: Yinghai Lu <yinghai@...nel.org>
> ---
> mm/page_cgroup.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> Index: linux-2.6/mm/page_cgroup.c
> ===================================================================
> --- linux-2.6.orig/mm/page_cgroup.c
> +++ linux-2.6/mm/page_cgroup.c
> @@ -47,6 +47,8 @@ static int __init alloc_node_page_cgroup
> struct page_cgroup *base, *pc;
> unsigned long table_size;
> unsigned long start_pfn, nr_pages, index;
> + struct page *page;
> + unsigned int order;
>
> start_pfn = NODE_DATA(nid)->node_start_pfn;
> nr_pages = NODE_DATA(nid)->node_spanned_pages;
> @@ -55,11 +57,13 @@ static int __init alloc_node_page_cgroup
> return 0;
>
> table_size = sizeof(struct page_cgroup) * nr_pages;
> -
> - base = __alloc_bootmem_node_nopanic(NODE_DATA(nid),
> - table_size, PAGE_SIZE, __pa(MAX_DMA_ADDRESS));
> - if (!base)
> + order = get_order(table_size);
> + page = alloc_pages_node(nid, GFP_NOWAIT | __GFP_ZERO, order);
> + if (!page)
> + page = alloc_pages_node(-1, GFP_NOWAIT | __GFP_ZERO, order);
> + if (!page)
> return -ENOMEM;
> + base = page_address(page);
> for (index = 0; index < nr_pages; index++) {
> pc = base + index;
> __init_page_cgroup(pc, start_pfn + index);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists