diff options
Diffstat (limited to 'arch/x86/include/asm/paravirt.h')
-rw-r--r-- | arch/x86/include/asm/paravirt.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index c26c6bf4da00..7e674ea80f0d 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h | |||
@@ -280,7 +280,6 @@ struct pv_mmu_ops { | |||
280 | pte_t *ptep, pte_t pte); | 280 | pte_t *ptep, pte_t pte); |
281 | 281 | ||
282 | pteval_t (*pte_val)(pte_t); | 282 | pteval_t (*pte_val)(pte_t); |
283 | pteval_t (*pte_flags)(pte_t); | ||
284 | pte_t (*make_pte)(pteval_t pte); | 283 | pte_t (*make_pte)(pteval_t pte); |
285 | 284 | ||
286 | pgdval_t (*pgd_val)(pgd_t); | 285 | pgdval_t (*pgd_val)(pgd_t); |
@@ -1086,23 +1085,6 @@ static inline pteval_t pte_val(pte_t pte) | |||
1086 | return ret; | 1085 | return ret; |
1087 | } | 1086 | } |
1088 | 1087 | ||
1089 | static inline pteval_t pte_flags(pte_t pte) | ||
1090 | { | ||
1091 | pteval_t ret; | ||
1092 | |||
1093 | if (sizeof(pteval_t) > sizeof(long)) | ||
1094 | ret = PVOP_CALL2(pteval_t, pv_mmu_ops.pte_flags, | ||
1095 | pte.pte, (u64)pte.pte >> 32); | ||
1096 | else | ||
1097 | ret = PVOP_CALL1(pteval_t, pv_mmu_ops.pte_flags, | ||
1098 | pte.pte); | ||
1099 | |||
1100 | #ifdef CONFIG_PARAVIRT_DEBUG | ||
1101 | BUG_ON(ret & PTE_PFN_MASK); | ||
1102 | #endif | ||
1103 | return ret; | ||
1104 | } | ||
1105 | |||
1106 | static inline pgd_t __pgd(pgdval_t val) | 1088 | static inline pgd_t __pgd(pgdval_t val) |
1107 | { | 1089 | { |
1108 | pgdval_t ret; | 1090 | pgdval_t ret; |
@@ -1391,8 +1373,6 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx, | |||
1391 | void _paravirt_nop(void); | 1373 | void _paravirt_nop(void); |
1392 | #define paravirt_nop ((void *)_paravirt_nop) | 1374 | #define paravirt_nop ((void *)_paravirt_nop) |
1393 | 1375 | ||
1394 | void paravirt_use_bytelocks(void); | ||
1395 | |||
1396 | #ifdef CONFIG_SMP | 1376 | #ifdef CONFIG_SMP |
1397 | 1377 | ||
1398 | static inline int __raw_spin_is_locked(struct raw_spinlock *lock) | 1378 | static inline int __raw_spin_is_locked(struct raw_spinlock *lock) |