lkml.org 
[lkml]   [2009]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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@kernel.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);


\
 
 \ /
  Last update: 2009-06-01 15:13    [W:1.078 / U:0.140 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site