diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-01-30 15:33:15 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 15:33:15 +0300 |
| commit | a632da2fc9c1e4e8021c5665fc34201fea485dcf (patch) | |
| tree | 666058d99a0e63460062b332781fef754b3a89ae | |
| parent | ef38503e034f82ad16a75a9dfea40ed7adaf00a8 (diff) | |
| download | linux-a632da2fc9c1e4e8021c5665fc34201fea485dcf.tar.xz | |
x86/paravirt: common implementation for pmd value ops
Remove duplicate __pmd/pmd_val functions.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | include/asm-x86/paravirt.h | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h index eac25b5323a2..3593211e345b 100644 --- a/include/asm-x86/paravirt.h +++ b/include/asm-x86/paravirt.h @@ -978,18 +978,37 @@ static inline pgdval_t pgd_val(pgd_t pgd) return ret; } -#ifdef CONFIG_X86_PAE -static inline pmd_t __pmd(unsigned long long val) +#if PAGETABLE_LEVELS >= 3 +static inline pmd_t __pmd(pmdval_t val) { - return (pmd_t) { PVOP_CALL2(unsigned long long, pv_mmu_ops.make_pmd, - val, val >> 32) }; + pmdval_t ret; + + if (sizeof(pmdval_t) > sizeof(long)) + ret = PVOP_CALL2(pmdval_t, pv_mmu_ops.make_pmd, + val, (u64)val >> 32); + else + ret = PVOP_CALL1(pmdval_t, pv_mmu_ops.make_pmd, + val); + + return (pmd_t) { ret }; } -static inline unsigned long long pmd_val(pmd_t x) +static inline pmdval_t pmd_val(pmd_t pmd) { - return PVOP_CALL2(unsigned long long, pv_mmu_ops.pmd_val, - x.pmd, x.pmd >> 32); + pmdval_t ret; + + if (sizeof(pmdval_t) > sizeof(long)) + ret = PVOP_CALL2(pmdval_t, pv_mmu_ops.pmd_val, + pmd.pmd, (u64)pmd.pmd >> 32); + else + ret = PVOP_CALL1(pmdval_t, pv_mmu_ops.pmd_val, + pmd.pmd); + + return ret; } +#endif /* PAGETABLE_LEVELS >= 3 */ + +#ifdef CONFIG_X86_PAE static inline void set_pte(pte_t *ptep, pte_t pteval) { |