summaryrefslogtreecommitdiff
path: root/include/asm-x86/msr.h
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-01-30 13:31:03 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:31:03 +0100
commit751de83c0c94a5235f14cff8549d3b39e745eb2b (patch)
tree54e4bd13f15f84d2536c6354894a5643658b6bb0 /include/asm-x86/msr.h
parentfe58fc8f40257948c2f9fc5a56863077ce3138f0 (diff)
x86: unify msr smp funcs
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> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/msr.h')
-rw-r--r--include/asm-x86/msr.h33
1 files changed, 7 insertions, 26 deletions
diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h
index 80b027081b3c..5c95d0be1132 100644
--- a/include/asm-x86/msr.h
+++ b/include/asm-x86/msr.h
@@ -139,29 +139,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__ */
@@ -327,6 +304,12 @@ static inline unsigned int cpuid_edx(unsigned int op)
:"c"(msr), "i"(-EIO), "0"(0)); \
ret__; })
+#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);
@@ -351,8 +334,6 @@ static inline int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)
}
#endif /* CONFIG_SMP */
#endif /* __KERNEL__ */
-#endif /* __ASSEMBLY__ */
-
-#endif /* !__i386__ */
+#endif /* __ASSEMBLY__ */
#endif