lkml.org 
[lkml]   [2007]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/10] unify msr smp funcs
    Date
    The functions under #ifdef CONFIG_SMP in msr.h are the same
    for both x86_64 and i386, and this patches removes one of them,
    putting them in a single location

    Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
    ---
    include/asm-x86/msr.h | 33 +++++++--------------------------
    1 files changed, 7 insertions(+), 26 deletions(-)

    diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h
    index ba4b314..b3cd509 100644
    --- a/include/asm-x86/msr.h
    +++ b/include/asm-x86/msr.h
    @@ -135,29 +135,6 @@ static inline int wrmsr_safe(u32 __msr, u32 __low, u32 __high)
    } while(0)
    #endif /* !CONFIG_PARAVIRT */

    -#ifdef CONFIG_SMP
    -void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h);
    -void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h);
    -int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h);
    -int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h);
    -#else /* CONFIG_SMP */
    -static inline void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h)
    -{
    - rdmsr(msr_no, *l, *h);
    -}
    -static inline void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)
    -{
    - wrmsr(msr_no, l, h);
    -}
    -static inline int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h)
    -{
    - return rdmsr_safe(msr_no, l, h);
    -}
    -static inline int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)
    -{
    - return wrmsr_safe(msr_no, l, h);
    -}
    -#endif /* CONFIG_SMP */
    #endif /* ! __ASSEMBLY__ */
    #endif /* __KERNEL__ */

    @@ -320,6 +297,12 @@ static inline unsigned int cpuid_edx(unsigned int op)
    return edx;
    }

    +#endif /* __ASSEMBLY__ */
    +
    +#endif /* !__i386__ */
    +
    +#ifndef __ASSEMBLY__
    +
    #ifdef CONFIG_SMP
    void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h);
    void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h);
    @@ -343,8 +326,6 @@ static inline int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)
    return wrmsr_safe(msr_no, l, h);
    }
    #endif /* CONFIG_SMP */
    -#endif /* __ASSEMBLY__ */
    -
    -#endif /* !__i386__ */
    +#endif /* __ASSEMBLY__ */

    #endif
    --
    1.4.4.2


    \
     
     \ /
      Last update: 2007-12-04 14:57    [W:0.020 / U:0.216 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site