lkml.org 
[lkml]   [2008]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 31/71] x86: PAT proper tracking of set_memory_uc and friends
    2.6.26-stable review patch.  If anyone has any objections, please let us
    know.

    ------------------
    From: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>

    commit c15238df3b65e34fadb1021b0fb0d5aebc7c42c6 upstream

    Big thinko in pat memtype tracking code. reserve_memtype should be called
    with physical address and not virtual address.

    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Cc: Chuck Ebbert <cebbert@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/x86/mm/pageattr.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/arch/x86/mm/pageattr.c
    +++ b/arch/x86/mm/pageattr.c
    @@ -789,7 +789,7 @@ int set_memory_uc(unsigned long addr, in
    /*
    * for now UC MINUS. see comments in ioremap_nocache()
    */
    - if (reserve_memtype(addr, addr + numpages * PAGE_SIZE,
    + if (reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE,
    _PAGE_CACHE_UC_MINUS, NULL))
    return -EINVAL;

    @@ -808,7 +808,7 @@ int set_memory_wc(unsigned long addr, in
    if (!pat_wc_enabled)
    return set_memory_uc(addr, numpages);

    - if (reserve_memtype(addr, addr + numpages * PAGE_SIZE,
    + if (reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE,
    _PAGE_CACHE_WC, NULL))
    return -EINVAL;

    @@ -824,7 +824,7 @@ int _set_memory_wb(unsigned long addr, i

    int set_memory_wb(unsigned long addr, int numpages)
    {
    - free_memtype(addr, addr + numpages * PAGE_SIZE);
    + free_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE);

    return _set_memory_wb(addr, numpages);
    }
    --


    \
     
     \ /
      Last update: 2008-10-07 02:55    [W:4.073 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site