Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / paravirt-spinlocks.c

diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
index 38d7f7f1dbc9e3de0ea5246eb0b5c90c6d0e14bc..95777b0faa7388f9c236bb093fae1a4934bb91c0 100644 (file)
--- a/arch/x86/kernel/paravirt-spinlocks.c
+++ b/arch/x86/kernel/paravirt-spinlocks.c
@@ -7,17 +7,24 @@
 
 #include <asm/paravirt.h>
 
+static inline void
+default_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
+{
+       __raw_spin_lock(lock);
+}
+
 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_lock_flags = default_spin_lock_flags,
        .spin_trylock = __ticket_spin_trylock,
        .spin_unlock = __ticket_spin_unlock,
 #endif
 };
-EXPORT_SYMBOL_GPL(pv_lock_ops);
+EXPORT_SYMBOL(pv_lock_ops);
 
 void __init paravirt_use_bytelocks(void)
 {