aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/paravirt-spinlocks.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-08 19:50:26 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-08 19:50:26 -0800
commit6f84b4dbe92e3ffb00f4d8cbe9a31b5be5ecd8ca (patch)
tree8b42bb624869aae84977b7990a7ef37d67959476 /arch/x86/kernel/paravirt-spinlocks.c
parent7f336bf1e59a0d49ffc178a5747ed7da25c6a6a3 (diff)
parent087052b02f42b50316c6e4d7f2d8dfba3de6fc2e (diff)
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix default_spin_lock_flags() prototype AMD IOMMU: __unmap_single: check for bad_dma_address instead of 0 AMD IOMMU: fix WARN_ON in dma_ops unmap path AMD IOMMU: fix typo in comment AMD IOMMU: fix loop counter in free_pagetable function AMD IOMMU: fix iommu_map_page function
Diffstat (limited to 'arch/x86/kernel/paravirt-spinlocks.c')
-rw-r--r--arch/x86/kernel/paravirt-spinlocks.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
index 0e9f1982b1d..95777b0faa7 100644
--- a/arch/x86/kernel/paravirt-spinlocks.c
+++ b/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);
}