Commit-ID: eb705905b713837d2cc26dfa019df16aeb8813be Gitweb: http://git.kernel.org/tip/eb705905b713837d2cc26dfa019df16aeb8813be Author: Davidlohr Bueso <davidl...@hp.com> AuthorDate: Mon, 19 May 2014 17:27:57 -0700 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Tue, 20 May 2014 09:53:11 +0900
rwsem: Fix warnings for CONFIG_RWSEM_GENERIC_SPINLOCK Optimistic spinning is only used by the xadd variant of rw-semaphores. Make sure that we use the old version of the __RWSEM_INITIALIZER macro for systems that rely on the spinlock one, otherwise warnings can be triggered, such as the following reported on an arm box: ipc/ipcns_notifier.c:22:8: warning: excess elements in struct initializer [enabled by default] ipc/ipcns_notifier.c:22:8: warning: (near initialization for 'ipcns_chain.rwsem') [enabled by default] ipc/ipcns_notifier.c:22:8: warning: excess elements in struct initializer [enabled by default] ipc/ipcns_notifier.c:22:8: warning: (near initialization for 'ipcns_chain.rwsem') [enabled by default] Signed-off-by: Davidlohr Bueso <davidl...@hp.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Peter Hurley <pe...@hurleysoftware.com> Cc: Alex Shi <alex....@linaro.org> Cc: Rik van Riel <r...@redhat.com> Cc: Andrea Arcangeli <aarca...@redhat.com> Cc: Norton Scott J <scott.nor...@hp.com> Cc: Andi Kleen <a...@firstfloor.org> Cc: Tim Chen <tim.c.c...@linux.intel.com> Cc: Paul McKenney <paul...@linux.vnet.ibm.com> Cc: Michel Lespinasse <wal...@google.com> Cc: Chandramouleeswaran Aswin <as...@hp.com> Cc: Jason Low <jason.l...@hp.com> Link: http://lkml.kernel.org/r/1400545677.6399.10.ca...@buesod1.americas.hpqcorp.net Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- include/linux/rwsem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h index 3e108f1..8d79708 100644 --- a/include/linux/rwsem.h +++ b/include/linux/rwsem.h @@ -64,7 +64,7 @@ static inline int rwsem_is_locked(struct rw_semaphore *sem) # define __RWSEM_DEP_MAP_INIT(lockname) #endif -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && !defined(CONFIG_RWSEM_GENERIC_SPINLOCK) #define __RWSEM_INITIALIZER(name) \ { RWSEM_UNLOCKED_VALUE, \ __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock), \ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
