diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
| commit | f8a6b2b9cee298a9663cbe38ce1eb5240987cb62 (patch) | |
| tree | b356490269c9e77d164dcc1477792b882fbb8bdb /arch/x86/include/asm/paravirt.h | |
| parent | ba1511bf7fbda452138e4096bf10d5a382710f4f (diff) | |
| parent | 071a0bc2ceace31266836801510879407a3701fa (diff) | |
Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/kernel/acpi/boot.c
arch/x86/mm/fault.c
Diffstat (limited to 'arch/x86/include/asm/paravirt.h')
| -rw-r--r-- | arch/x86/include/asm/paravirt.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index ff691736f5e9..1c244b64573f 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h | |||
| @@ -1482,6 +1482,7 @@ static inline int __raw_spin_is_contended(struct raw_spinlock *lock) | |||
| 1482 | { | 1482 | { |
| 1483 | return PVOP_CALL1(int, pv_lock_ops.spin_is_contended, lock); | 1483 | return PVOP_CALL1(int, pv_lock_ops.spin_is_contended, lock); |
| 1484 | } | 1484 | } |
| 1485 | #define __raw_spin_is_contended __raw_spin_is_contended | ||
| 1485 | 1486 | ||
| 1486 | static __always_inline void __raw_spin_lock(struct raw_spinlock *lock) | 1487 | static __always_inline void __raw_spin_lock(struct raw_spinlock *lock) |
| 1487 | { | 1488 | { |