diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-06-03 10:07:35 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-06-03 10:07:35 +0200 |
commit | 71966f3a0b24b408a87a0c475262638fbb71da99 (patch) | |
tree | ce900472dd12f03fd6d0e764ea9f5a647471689d /arch/x86/include/asm/paravirt_types.h | |
parent | 34e7724c0767f04f6199f2bd7232e9ab1207e1df (diff) | |
parent | 92ae18371cb1abb4e186dd9d48de2bb0d9bba626 (diff) | |
download | linux-stable-71966f3a0b24b408a87a0c475262638fbb71da99.tar.gz linux-stable-71966f3a0b24b408a87a0c475262638fbb71da99.tar.bz2 linux-stable-71966f3a0b24b408a87a0c475262638fbb71da99.zip |
Merge branch 'locking/core' into x86/core, to prepare for dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/paravirt_types.h')
-rw-r--r-- | arch/x86/include/asm/paravirt_types.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h index 344c646e7f06..a6b8f9fadb06 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h @@ -334,9 +334,19 @@ struct arch_spinlock; typedef u16 __ticket_t; #endif +struct qspinlock; + struct pv_lock_ops { +#ifdef CONFIG_QUEUED_SPINLOCKS + void (*queued_spin_lock_slowpath)(struct qspinlock *lock, u32 val); + struct paravirt_callee_save queued_spin_unlock; + + void (*wait)(u8 *ptr, u8 val); + void (*kick)(int cpu); +#else /* !CONFIG_QUEUED_SPINLOCKS */ struct paravirt_callee_save lock_spinning; void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket); +#endif /* !CONFIG_QUEUED_SPINLOCKS */ }; /* This contains all the paravirt structures: we get a convenient |