diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:39:15 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:39:15 +0200 |
| commit | eac4345be6d17541039791f15f173d0426423df1 (patch) | |
| tree | 1101a0a9bdbac146b7316eefbfc97b8a6917fc55 /arch/x86/kernel/paravirt.c | |
| parent | 5fbf24659b75356e2142e1f1b88f67b34cbc3e75 (diff) | |
| parent | d5de8841355a48f7f634a04507185eaf1f9755e3 (diff) | |
| download | linux-eac4345be6d17541039791f15f173d0426423df1.tar.gz linux-eac4345be6d17541039791f15f173d0426423df1.tar.bz2 linux-eac4345be6d17541039791f15f173d0426423df1.zip | |
Merge branch 'x86/spinlocks' into x86/xen
Diffstat (limited to 'arch/x86/kernel/paravirt.c')
| -rw-r--r-- | arch/x86/kernel/paravirt.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index d8f2277be5a0..7faea1817d05 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -268,17 +268,6 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void) return __get_cpu_var(paravirt_lazy_mode); } -void __init paravirt_use_bytelocks(void) -{ -#ifdef CONFIG_SMP - pv_lock_ops.spin_is_locked = __byte_spin_is_locked; - pv_lock_ops.spin_is_contended = __byte_spin_is_contended; - pv_lock_ops.spin_lock = __byte_spin_lock; - pv_lock_ops.spin_trylock = __byte_spin_trylock; - pv_lock_ops.spin_unlock = __byte_spin_unlock; -#endif -} - struct pv_info pv_info = { .name = "bare hardware", .paravirt_enabled = 0, @@ -465,18 +454,6 @@ struct pv_mmu_ops pv_mmu_ops = { .set_fixmap = native_set_fixmap, }; -struct pv_lock_ops pv_lock_ops = { -#ifdef CONFIG_SMP - .spin_is_locked = __ticket_spin_is_locked, - .spin_is_contended = __ticket_spin_is_contended, - - .spin_lock = __ticket_spin_lock, - .spin_trylock = __ticket_spin_trylock, - .spin_unlock = __ticket_spin_unlock, -#endif -}; -EXPORT_SYMBOL_GPL(pv_lock_ops); - EXPORT_SYMBOL_GPL(pv_time_ops); EXPORT_SYMBOL (pv_cpu_ops); EXPORT_SYMBOL (pv_mmu_ops); |