mirror of
https://github.com/S3NEO/android_kernel_samsung_msm8226.git
synced 2024-11-07 03:47:13 +00:00
[PATCH] lockdep: name some old style locks
Name some of the remaning 'old_style_spin_init' locks Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
a4c410f00f
commit
6cfd76a26d
11 changed files with 16 additions and 13 deletions
|
@ -452,7 +452,7 @@ void die(const char * str, struct pt_regs * regs, long err)
|
||||||
u32 lock_owner;
|
u32 lock_owner;
|
||||||
int lock_owner_depth;
|
int lock_owner_depth;
|
||||||
} die = {
|
} die = {
|
||||||
.lock = SPIN_LOCK_UNLOCKED,
|
.lock = __SPIN_LOCK_UNLOCKED(die.lock),
|
||||||
.lock_owner = -1,
|
.lock_owner = -1,
|
||||||
.lock_owner_depth = 0
|
.lock_owner_depth = 0
|
||||||
};
|
};
|
||||||
|
|
|
@ -75,8 +75,8 @@ struct rw_semaphore {
|
||||||
|
|
||||||
|
|
||||||
#define __RWSEM_INITIALIZER(name) \
|
#define __RWSEM_INITIALIZER(name) \
|
||||||
{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, LIST_HEAD_INIT((name).wait_list) \
|
{ RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \
|
||||||
__RWSEM_DEP_MAP_INIT(name) }
|
LIST_HEAD_INIT((name).wait_list) __RWSEM_DEP_MAP_INIT(name) }
|
||||||
|
|
||||||
#define DECLARE_RWSEM(name) \
|
#define DECLARE_RWSEM(name) \
|
||||||
struct rw_semaphore name = __RWSEM_INITIALIZER(name)
|
struct rw_semaphore name = __RWSEM_INITIALIZER(name)
|
||||||
|
|
|
@ -73,7 +73,7 @@
|
||||||
extern struct nsproxy init_nsproxy;
|
extern struct nsproxy init_nsproxy;
|
||||||
#define INIT_NSPROXY(nsproxy) { \
|
#define INIT_NSPROXY(nsproxy) { \
|
||||||
.count = ATOMIC_INIT(1), \
|
.count = ATOMIC_INIT(1), \
|
||||||
.nslock = SPIN_LOCK_UNLOCKED, \
|
.nslock = __SPIN_LOCK_UNLOCKED(nsproxy.nslock), \
|
||||||
.uts_ns = &init_uts_ns, \
|
.uts_ns = &init_uts_ns, \
|
||||||
.namespace = NULL, \
|
.namespace = NULL, \
|
||||||
INIT_IPC_NS(ipc_ns) \
|
INIT_IPC_NS(ipc_ns) \
|
||||||
|
|
|
@ -94,7 +94,7 @@ do { \
|
||||||
|
|
||||||
#define __MUTEX_INITIALIZER(lockname) \
|
#define __MUTEX_INITIALIZER(lockname) \
|
||||||
{ .count = ATOMIC_INIT(1) \
|
{ .count = ATOMIC_INIT(1) \
|
||||||
, .wait_lock = SPIN_LOCK_UNLOCKED \
|
, .wait_lock = __SPIN_LOCK_UNLOCKED(lockname.wait_lock) \
|
||||||
, .wait_list = LIST_HEAD_INIT(lockname.wait_list) \
|
, .wait_list = LIST_HEAD_INIT(lockname.wait_list) \
|
||||||
__DEBUG_MUTEX_INITIALIZER(lockname) \
|
__DEBUG_MUTEX_INITIALIZER(lockname) \
|
||||||
__DEP_MAP_MUTEX_INITIALIZER(lockname) }
|
__DEP_MAP_MUTEX_INITIALIZER(lockname) }
|
||||||
|
|
|
@ -63,7 +63,7 @@ struct hrtimer_sleeper;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define __RT_MUTEX_INITIALIZER(mutexname) \
|
#define __RT_MUTEX_INITIALIZER(mutexname) \
|
||||||
{ .wait_lock = SPIN_LOCK_UNLOCKED \
|
{ .wait_lock = __SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \
|
||||||
, .wait_list = PLIST_HEAD_INIT(mutexname.wait_list, mutexname.wait_lock) \
|
, .wait_list = PLIST_HEAD_INIT(mutexname.wait_list, mutexname.wait_lock) \
|
||||||
, .owner = NULL \
|
, .owner = NULL \
|
||||||
__DEBUG_RT_MUTEX_INITIALIZER(mutexname)}
|
__DEBUG_RT_MUTEX_INITIALIZER(mutexname)}
|
||||||
|
|
|
@ -44,7 +44,8 @@ struct rw_semaphore {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define __RWSEM_INITIALIZER(name) \
|
#define __RWSEM_INITIALIZER(name) \
|
||||||
{ 0, SPIN_LOCK_UNLOCKED, LIST_HEAD_INIT((name).wait_list) __RWSEM_DEP_MAP_INIT(name) }
|
{ 0, __SPIN_LOCK_UNLOCKED(name.wait_lock), LIST_HEAD_INIT((name).wait_list) \
|
||||||
|
__RWSEM_DEP_MAP_INIT(name) }
|
||||||
|
|
||||||
#define DECLARE_RWSEM(name) \
|
#define DECLARE_RWSEM(name) \
|
||||||
struct rw_semaphore name = __RWSEM_INITIALIZER(name)
|
struct rw_semaphore name = __RWSEM_INITIALIZER(name)
|
||||||
|
|
|
@ -222,7 +222,7 @@ struct rpc_wait_queue {
|
||||||
|
|
||||||
#ifndef RPC_DEBUG
|
#ifndef RPC_DEBUG
|
||||||
# define RPC_WAITQ_INIT(var,qname) { \
|
# define RPC_WAITQ_INIT(var,qname) { \
|
||||||
.lock = SPIN_LOCK_UNLOCKED, \
|
.lock = __SPIN_LOCK_UNLOCKED(var.lock), \
|
||||||
.tasks = { \
|
.tasks = { \
|
||||||
[0] = LIST_HEAD_INIT(var.tasks[0]), \
|
[0] = LIST_HEAD_INIT(var.tasks[0]), \
|
||||||
[1] = LIST_HEAD_INIT(var.tasks[1]), \
|
[1] = LIST_HEAD_INIT(var.tasks[1]), \
|
||||||
|
@ -231,7 +231,7 @@ struct rpc_wait_queue {
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
# define RPC_WAITQ_INIT(var,qname) { \
|
# define RPC_WAITQ_INIT(var,qname) { \
|
||||||
.lock = SPIN_LOCK_UNLOCKED, \
|
.lock = __SPIN_LOCK_UNLOCKED(var.lock), \
|
||||||
.tasks = { \
|
.tasks = { \
|
||||||
[0] = LIST_HEAD_INIT(var.tasks[0]), \
|
[0] = LIST_HEAD_INIT(var.tasks[0]), \
|
||||||
[1] = LIST_HEAD_INIT(var.tasks[1]), \
|
[1] = LIST_HEAD_INIT(var.tasks[1]), \
|
||||||
|
|
|
@ -89,7 +89,8 @@ struct acct_glbs {
|
||||||
struct timer_list timer;
|
struct timer_list timer;
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct acct_glbs acct_globals __cacheline_aligned = {SPIN_LOCK_UNLOCKED};
|
static struct acct_glbs acct_globals __cacheline_aligned =
|
||||||
|
{__SPIN_LOCK_UNLOCKED(acct_globals.lock)};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Called whenever the timer says to check the free space.
|
* Called whenever the timer says to check the free space.
|
||||||
|
|
|
@ -54,7 +54,7 @@ struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned = {
|
||||||
.chip = &no_irq_chip,
|
.chip = &no_irq_chip,
|
||||||
.handle_irq = handle_bad_irq,
|
.handle_irq = handle_bad_irq,
|
||||||
.depth = 1,
|
.depth = 1,
|
||||||
.lock = SPIN_LOCK_UNLOCKED,
|
.lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock),
|
||||||
#ifdef CONFIG_SMP
|
#ifdef CONFIG_SMP
|
||||||
.affinity = CPU_MASK_ALL
|
.affinity = CPU_MASK_ALL
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -119,7 +119,8 @@ EXPORT_SYMBOL(svc_auth_unregister);
|
||||||
#define DN_HASHMASK (DN_HASHMAX-1)
|
#define DN_HASHMASK (DN_HASHMAX-1)
|
||||||
|
|
||||||
static struct hlist_head auth_domain_table[DN_HASHMAX];
|
static struct hlist_head auth_domain_table[DN_HASHMAX];
|
||||||
static spinlock_t auth_domain_lock = SPIN_LOCK_UNLOCKED;
|
static spinlock_t auth_domain_lock =
|
||||||
|
__SPIN_LOCK_UNLOCKED(auth_domain_lock);
|
||||||
|
|
||||||
void auth_domain_put(struct auth_domain *dom)
|
void auth_domain_put(struct auth_domain *dom)
|
||||||
{
|
{
|
||||||
|
|
|
@ -27,7 +27,7 @@ static DEFINE_MUTEX(key_session_mutex);
|
||||||
struct key_user root_key_user = {
|
struct key_user root_key_user = {
|
||||||
.usage = ATOMIC_INIT(3),
|
.usage = ATOMIC_INIT(3),
|
||||||
.consq = LIST_HEAD_INIT(root_key_user.consq),
|
.consq = LIST_HEAD_INIT(root_key_user.consq),
|
||||||
.lock = SPIN_LOCK_UNLOCKED,
|
.lock = __SPIN_LOCK_UNLOCKED(root_key_user.lock),
|
||||||
.nkeys = ATOMIC_INIT(2),
|
.nkeys = ATOMIC_INIT(2),
|
||||||
.nikeys = ATOMIC_INIT(2),
|
.nikeys = ATOMIC_INIT(2),
|
||||||
.uid = 0,
|
.uid = 0,
|
||||||
|
|
Loading…
Reference in a new issue