diff --git a/[refs] b/[refs]
index a29eff01c281..78e9493f71a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8d9905d025d80a2357e8ce4704fde2923f6a1bd
+refs/heads/master: 087052b02f42b50316c6e4d7f2d8dfba3de6fc2e
diff --git a/trunk/arch/x86/kernel/paravirt-spinlocks.c b/trunk/arch/x86/kernel/paravirt-spinlocks.c
index 0e9f1982b1dd..95777b0faa73 100644
--- a/trunk/arch/x86/kernel/paravirt-spinlocks.c
+++ b/trunk/arch/x86/kernel/paravirt-spinlocks.c
@@ -7,7 +7,8 @@
 
 #include <asm/paravirt.h>
 
-static void default_spin_lock_flags(struct raw_spinlock *lock, unsigned long flags)
+static inline void
+default_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
 {
 	__raw_spin_lock(lock);
 }