They have no users.  Leave native_read_tscp, which seems potentially
useful despite also having no callers.

Signed-off-by: Andy Lutomirski <l...@kernel.org>
---
 arch/x86/include/asm/msr.h      |  9 ---------
 arch/x86/include/asm/paravirt.h | 16 ----------------
 2 files changed, 25 deletions(-)

diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 8826780c80dd..8612b0086933 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -190,17 +190,8 @@ do {                                                       
\
 
 #define rdpmcl(counter, val) ((val) = native_read_pmc(counter))
 
-#define rdtscp(low, high, aux)                                 \
-do {                                                            \
-       unsigned long long _val = native_read_tscp(&(aux));     \
-       (low) = (u32)_val;                                      \
-       (high) = (u32)(_val >> 32);                             \
-} while (0)
-
-#define rdtscpll(val, aux) (val) = native_read_tscp(&(aux))
 
 #endif /* !CONFIG_PARAVIRT */
-
 /*
  * 64-bit version of wrmsr_safe():
  */
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 5dd49e3f472e..a5de6bd8abcc 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -218,22 +218,6 @@ static inline unsigned long long paravirt_rdtscp(unsigned 
int *aux)
        return PVOP_CALL1(u64, pv_cpu_ops.read_tscp, aux);
 }
 
-#define rdtscp(low, high, aux)                         \
-do {                                                   \
-       int __aux;                                      \
-       unsigned long __val = paravirt_rdtscp(&__aux);  \
-       (low) = (u32)__val;                             \
-       (high) = (u32)(__val >> 32);                    \
-       (aux) = __aux;                                  \
-} while (0)
-
-#define rdtscpll(val, aux)                             \
-do {                                                   \
-       unsigned long __aux;                            \
-       val = paravirt_rdtscp(&__aux);                  \
-       (aux) = __aux;                                  \
-} while (0)
-
 static inline void paravirt_alloc_ldt(struct desc_struct *ldt, unsigned 
entries)
 {
        PVOP_VCALL2(pv_cpu_ops.alloc_ldt, ldt, entries);
-- 
2.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to