From: Peter Zijlstra <peterz@infradead.org>
Date: Wed, 16 Jul 2014 12:54:55 +0000 (+0200)
Subject: locking/rwsem: Rename 'activity' to 'count'
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~262^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13b9a962a2594ee880c5d50d7f70964da1d4fe5a;p=pandora-kernel.git

locking/rwsem: Rename 'activity' to 'count'

There are two definitions of struct rw_semaphore, one in linux/rwsem.h
and one in linux/rwsem-spinlock.h.

For some reason they have different names for the initial field. This
makes it impossible to use C99 named initialization for
__RWSEM_INITIALIZER() -- or we have to duplicate that entire thing
along with the structure definitions.

The simpler patch is renaming the rwsem-spinlock variant to match the
regular rwsem.

This allows us to switch to C99 named initialization.

Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/n/tip-bmrZolsbGmautmzrerog27io@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

Reading git-diff-tree failed