Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=54413927f022292aeccadd268fbf1c0b42129945
Commit:     54413927f022292aeccadd268fbf1c0b42129945
Parent:     076422d2af7e3d8e72c6e70843f6ea377714b082
Author:     Amul Shah <[EMAIL PROTECTED]>
AuthorDate: Tue Feb 13 13:26:20 2007 +0100
Committer:  Andi Kleen <[EMAIL PROTECTED]>
CommitDate: Tue Feb 13 13:26:20 2007 +0100

    [PATCH] x86-64: x86_64-make-the-numa-hash-function-nodemap-allocation fix 
fix
    
    - Removed an extraneous debug message from allocate_cachealigned_map
    
    - Changed extract_lsb_from_nodes to return 63 for the case where there was
      only one memory node.  The prevents the creation of the dynamic hashmap.
    
    - Changed extract_lsb_from_nodes to use only the starting memory address of
      a node.  On an ES7000, our nodes overlap the starting and ending address,
      meaning, that we see nodes like
    
        00000 - 10000
        10000 - 20000
    
      But other systems have nodes whose start and end addresses do not overlap.
       For example:
    
        00000 - 0FFFF
        10000 - 1FFFF
    
      In this case, using the ending address will result in an LSB much lower
      than what is possible.  In this case an LSB of 1 when in reality it should
      be 16.
    
    Cc: Andi Kleen <[EMAIL PROTECTED]>
    Cc: Rohit Seth <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
---
 arch/x86_64/mm/numa.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c
index 7d9c428..1ec16ea 100644
--- a/arch/x86_64/mm/numa.c
+++ b/arch/x86_64/mm/numa.c
@@ -78,11 +78,8 @@ static int __init allocate_cachealigned_memnodemap(void)
        unsigned long pad, pad_addr;
 
        memnodemap = memnode.embedded_map;
-       if (memnodemapsize <= 48) {
-               printk(KERN_DEBUG "NUMA: Allocated memnodemap from %lx - %lx\n",
-                      nodemap_addr, nodemap_addr + nodemap_size);
+       if (memnodemapsize <= 48)
                return 0;
-       }
 
        pad = L1_CACHE_BYTES - 1;
        pad_addr = 0x8000;
@@ -110,7 +107,7 @@ static int __init allocate_cachealigned_memnodemap(void)
 static int __init
 extract_lsb_from_nodes (const struct bootnode *nodes, int numnodes)
 {
-       int i;
+       int i, nodes_used = 0;
        unsigned long start, end;
        unsigned long bitfield = 0, memtop = 0;
 
@@ -119,11 +116,15 @@ extract_lsb_from_nodes (const struct bootnode *nodes, int 
numnodes)
                end = nodes[i].end;
                if (start >= end)
                        continue;
-               bitfield |= start | end;
+               bitfield |= start;
+               nodes_used++;
                if (end > memtop)
                        memtop = end;
        }
-       i = find_first_bit(&bitfield, sizeof(unsigned long)*8);
+       if (nodes_used <= 1)
+               i = 63;
+       else
+               i = find_first_bit(&bitfield, sizeof(unsigned long)*8);
        memnodemapsize = (memtop >> i)+1;
        return i;
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to