lkml.org 
[lkml]   [2010]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 24/25] x86: Put 64 bit numa node memmap above 16M
    Date
    Do not use 0x8000 hard code value anymore.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    ---
    arch/x86/mm/numa_64.c | 2 +-
    arch/x86/mm/srat_64.c | 4 ++--
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
    index 92c01a5..93a1e07 100644
    --- a/arch/x86/mm/numa_64.c
    +++ b/arch/x86/mm/numa_64.c
    @@ -85,7 +85,7 @@ static int __init allocate_cachealigned_memnodemap(void)
    if (memnodemapsize <= ARRAY_SIZE(memnode.embedded_map))
    return 0;

    - addr = 0x8000;
    + addr = __pa(MAX_DMA_ADDRESS);
    nodemap_size = roundup(sizeof(s16) * memnodemapsize, L1_CACHE_BYTES);
    nodemap_addr = lmb_find_in_range(addr, max_pfn<<PAGE_SHIFT,
    nodemap_size, L1_CACHE_BYTES);
    diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
    index 8f82c80..1f9b7b7 100644
    --- a/arch/x86/mm/srat_64.c
    +++ b/arch/x86/mm/srat_64.c
    @@ -99,8 +99,8 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
    unsigned long phys;

    length = slit->header.length;
    - phys = lmb_find_in_range(0, max_pfn_mapped<<PAGE_SHIFT, length,
    - PAGE_SIZE);
    + phys = lmb_find_in_range(__pa(MAX_DMA_ADDRESS), max_pfn_mapped<<PAGE_SHIFT,
    + length, PAGE_SIZE);

    if (phys == (unsigned long)LMB_ERROR)
    panic(" Can not save slit!\n");
    --
    1.6.4.2


    \
     
     \ /
      Last update: 2010-06-22 19:33    [W:0.025 / U:0.392 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site