lkml.org 
[lkml]   [2011]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/numa] x86-32, numa: Remove redundant node_remap_size[]
    Commit-ID:  198bd06bbfde2984027e91f64c55eb19a7034a27
    Gitweb: http://git.kernel.org/tip/198bd06bbfde2984027e91f64c55eb19a7034a27
    Author: Tejun Heo <tj@kernel.org>
    AuthorDate: Tue, 5 Apr 2011 00:23:59 +0200
    Committer: H. Peter Anvin <hpa@zytor.com>
    CommitDate: Wed, 6 Apr 2011 17:57:50 -0700

    x86-32, numa: Remove redundant node_remap_size[]

    Remap area size can be determined from node_remap_start_vaddr[] and
    node_remap_end_vaddr[] making node_remap_size[] redundant. Remove it.

    While at it, make resume_map_numa_kva() use @nr_pages for number of
    pages instead of @size.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Link: http://lkml.kernel.org/r/1301955840-7246-14-git-send-email-tj@kernel.org
    Acked-by: Yinghai Lu <yinghai@kernel.org>
    Cc: David Rientjes <rientjes@google.com>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    ---
    arch/x86/mm/numa_32.c | 10 ++++------
    1 files changed, 4 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
    index 960ea7b..f325e6f 100644
    --- a/arch/x86/mm/numa_32.c
    +++ b/arch/x86/mm/numa_32.c
    @@ -104,7 +104,6 @@ extern unsigned long highend_pfn, highstart_pfn;

    #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)

    -static unsigned long node_remap_size[MAX_NUMNODES];
    static void *node_remap_start_vaddr[MAX_NUMNODES];
    void set_pmd_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags);

    @@ -214,15 +213,16 @@ void resume_map_numa_kva(pgd_t *pgd_base)
    int node;

    for_each_online_node(node) {
    - unsigned long start_va, start_pfn, size, pfn;
    + unsigned long start_va, start_pfn, nr_pages, pfn;

    start_va = (unsigned long)node_remap_start_vaddr[node];
    start_pfn = node_remap_start_pfn[node];
    - size = node_remap_size[node];
    + nr_pages = (node_remap_end_vaddr[node] -
    + node_remap_start_vaddr[node]) >> PAGE_SHIFT;

    printk(KERN_DEBUG "%s: node %d\n", __func__, node);

    - for (pfn = 0; pfn < size; pfn += PTRS_PER_PTE) {
    + for (pfn = 0; pfn < nr_pages; pfn += PTRS_PER_PTE) {
    unsigned long vaddr = start_va + (pfn << PAGE_SHIFT);
    pgd_t *pgd = pgd_base + pgd_index(vaddr);
    pud_t *pud = pud_offset(pgd, vaddr);
    @@ -294,8 +294,6 @@ static __init void init_alloc_remap(int nid)

    /* initialize remap allocator parameters */
    node_remap_start_pfn[nid] = node_pa >> PAGE_SHIFT;
    - node_remap_size[nid] = size >> PAGE_SHIFT;
    -
    node_remap_start_vaddr[nid] = remap_va;
    node_remap_end_vaddr[nid] = remap_va + size;
    node_remap_alloc_vaddr[nid] = remap_va;

    \
     
     \ /
      Last update: 2011-04-07 22:35    [W:0.026 / U:0.964 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site