Message ID | 51C49C45.1060207@gmx.de (mailing list archive) |
---|---|
State | Accepted, archived |
Headers | show |
On Fri, Jun 21, 2013 at 07:32:37PM +0100, Helge Deller wrote: > Thanks Will, Hi Helge, > forwarding to linux-parisc@vger.kernel.org so that it gets into parisc patchwork. > > I'll queue this patch up for 3.11 if it's OK for you. Fine by me. Each patch in the series is self-contained, so they can get merged via the arch trees without any problem. Thanks! Will -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jun 24, 2013 at 09:55:22AM +0100, Will Deacon wrote: > On Fri, Jun 21, 2013 at 07:32:37PM +0100, Helge Deller wrote: > > Thanks Will, > > Hi Helge, > > > forwarding to linux-parisc@vger.kernel.org so that it gets into parisc patchwork. > > > > I'll queue this patch up for 3.11 if it's OK for you. > > Fine by me. Each patch in the series is self-contained, so they can get > merged via the arch trees without any problem. Wait a second; turns out the GENERIC_LOCKBREAK code *can* emit calls to these functions, so I'll need to sort that out before you can take the arch-side of things. Better hold off on this until I have that fixed. Cheers, Will -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/parisc/include/asm/spinlock.h b/arch/parisc/include/asm/spinlock.h index 3516e0b..64f2992 100644 --- a/arch/parisc/include/asm/spinlock.h +++ b/arch/parisc/include/asm/spinlock.h @@ -191,8 +191,4 @@ static __inline__ int arch_write_can_lock(arch_rwlock_t *rw) #define arch_read_lock_flags(lock, flags) arch_read_lock(lock) #define arch_write_lock_flags(lock, flags) arch_write_lock(lock) -#define arch_spin_relax(lock) cpu_relax() -#define arch_read_relax(lock) cpu_relax() -#define arch_write_relax(lock) cpu_relax() - #endif /* __ASM_SPINLOCK_H */