diff options
Diffstat (limited to 'arch/powerpc/include/asm/spinlock.h')
-rw-r--r-- | arch/powerpc/include/asm/spinlock.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h index f9611bd69ed2..7124fc06ad47 100644 --- a/arch/powerpc/include/asm/spinlock.h +++ b/arch/powerpc/include/asm/spinlock.h | |||
@@ -23,7 +23,6 @@ | |||
23 | #ifdef CONFIG_PPC64 | 23 | #ifdef CONFIG_PPC64 |
24 | #include <asm/paca.h> | 24 | #include <asm/paca.h> |
25 | #include <asm/hvcall.h> | 25 | #include <asm/hvcall.h> |
26 | #include <asm/iseries/hv_call.h> | ||
27 | #endif | 26 | #endif |
28 | #include <asm/asm-compat.h> | 27 | #include <asm/asm-compat.h> |
29 | #include <asm/synch.h> | 28 | #include <asm/synch.h> |
@@ -95,12 +94,12 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock) | |||
95 | * value. | 94 | * value. |
96 | */ | 95 | */ |
97 | 96 | ||
98 | #if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES) | 97 | #if defined(CONFIG_PPC_SPLPAR) |
99 | /* We only yield to the hypervisor if we are in shared processor mode */ | 98 | /* We only yield to the hypervisor if we are in shared processor mode */ |
100 | #define SHARED_PROCESSOR (get_lppaca()->shared_proc) | 99 | #define SHARED_PROCESSOR (get_lppaca()->shared_proc) |
101 | extern void __spin_yield(arch_spinlock_t *lock); | 100 | extern void __spin_yield(arch_spinlock_t *lock); |
102 | extern void __rw_yield(arch_rwlock_t *lock); | 101 | extern void __rw_yield(arch_rwlock_t *lock); |
103 | #else /* SPLPAR || ISERIES */ | 102 | #else /* SPLPAR */ |
104 | #define __spin_yield(x) barrier() | 103 | #define __spin_yield(x) barrier() |
105 | #define __rw_yield(x) barrier() | 104 | #define __rw_yield(x) barrier() |
106 | #define SHARED_PROCESSOR 0 | 105 | #define SHARED_PROCESSOR 0 |