lkml.org 
[lkml]   [2009]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 1/6] x86: mtrr replace MTRRcap_MSR with msr-index's MSR_MTRRcap
    From
    Date

    Use standard msr-index.h's MSR declaration and no need to declare again.

    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
    ---
    arch/x86/kernel/cpu/mtrr/generic.c | 4 ++--
    arch/x86/kernel/cpu/mtrr/main.c | 2 +-
    arch/x86/kernel/cpu/mtrr/mtrr.h | 1 -
    3 files changed, 3 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
    index d21d4fb..b358320 100644
    --- a/arch/x86/kernel/cpu/mtrr/generic.c
    +++ b/arch/x86/kernel/cpu/mtrr/generic.c
    @@ -310,7 +310,7 @@ void __init get_mtrr_state(void)

    vrs = mtrr_state.var_ranges;

    - rdmsr(MTRRcap_MSR, lo, dummy);
    + rdmsr(MSR_MTRRcap, lo, dummy);
    mtrr_state.have_fixed = (lo >> 8) & 1;

    for (i = 0; i < num_var_ranges; i++)
    @@ -707,7 +707,7 @@ int generic_validate_add_page(unsigned long base, unsigned long size, unsigned i
    static int generic_have_wrcomb(void)
    {
    unsigned long config, dummy;
    - rdmsr(MTRRcap_MSR, config, dummy);
    + rdmsr(MSR_MTRRcap, config, dummy);
    return (config & (1 << 10));
    }

    diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
    index 03cda01..8fc248b 100644
    --- a/arch/x86/kernel/cpu/mtrr/main.c
    +++ b/arch/x86/kernel/cpu/mtrr/main.c
    @@ -104,7 +104,7 @@ static void __init set_num_var_ranges(void)
    unsigned long config = 0, dummy;

    if (use_intel()) {
    - rdmsr(MTRRcap_MSR, config, dummy);
    + rdmsr(MSR_MTRRcap, config, dummy);
    } else if (is_cpu(AMD))
    config = 2;
    else if (is_cpu(CYRIX) || is_cpu(CENTAUR))
    diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
    index 77f67f7..5d37fb1 100644
    --- a/arch/x86/kernel/cpu/mtrr/mtrr.h
    +++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
    @@ -5,7 +5,6 @@
    #include <linux/types.h>
    #include <linux/stddef.h>

    -#define MTRRcap_MSR 0x0fe
    #define MTRRdefType_MSR 0x2ff

    #define MTRRfix64K_00000_MSR 0x250
    --
    1.6.0.6




    \
     
     \ /
      Last update: 2009-05-14 09:45    [W:3.445 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site