X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-x86%2Fspinlock.h;fp=include%2Fasm-x86%2Fspinlock.h;h=157ff7fab97aba964216472e6f67aac147e3b901;hb=eceb1383361c6327cef4de01d278cd6722ebceeb;hp=b5a4551fd5652c619fc4d36f74e9685e3c7197d6;hpb=4c7145a1ec1bb789d5f07e47510e8bda546a7c4a;p=linux-2.6-omap-h63xx.git

diff --git a/include/asm-x86/spinlock.h b/include/asm-x86/spinlock.h
index b5a4551fd56..157ff7fab97 100644
--- a/include/asm-x86/spinlock.h
+++ b/include/asm-x86/spinlock.h
@@ -172,8 +172,6 @@ static inline int __ticket_spin_is_contended(raw_spinlock_t *lock)
 	return (((tmp >> TICKET_SHIFT) - tmp) & ((1 << TICKET_SHIFT) - 1)) > 1;
 }
 
-#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
-
 #ifdef CONFIG_PARAVIRT
 /*
  * Define virtualization-friendly old-style lock byte lock, for use in
@@ -262,6 +260,13 @@ static __always_inline void __raw_spin_unlock(raw_spinlock_t *lock)
 {
 	__ticket_spin_unlock(lock);
 }
+
+static __always_inline void __raw_spin_lock_flags(raw_spinlock_t *lock,
+						  unsigned long flags)
+{
+	__raw_spin_lock(lock);
+}
+
 #endif	/* CONFIG_PARAVIRT */
 
 static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock)