OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
de68294
)
net: cassini: use nested lock annotation
author
Emil Goode
<emilgoode@gmail.com>
Thu, 8 May 2014 23:07:17 +0000
(
01:07
+0200)
committer
David S. Miller
<davem@davemloft.net>
Fri, 9 May 2014 20:34:10 +0000
(16:34 -0400)
In the cas_lock_tx function we acquire multiple locks in a loop and
need to use nested lock annotation to prevent lockdep warnings.
Reported-by: Meelis Roos <mroos@linux.ee>
Signed-off-by: Emil Goode <emilgoode@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/sun/cassini.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/sun/cassini.c
b/drivers/net/ethernet/sun/cassini.c
index
df8d383
..
b9ac20f
100644
(file)
--- a/
drivers/net/ethernet/sun/cassini.c
+++ b/
drivers/net/ethernet/sun/cassini.c
@@
-246,7
+246,7
@@
static inline void cas_lock_tx(struct cas *cp)
int i;
for (i = 0; i < N_TX_RINGS; i++)
- spin_lock
(&cp->tx_lock[i]
);
+ spin_lock
_nested(&cp->tx_lock[i], i
);
}
static inline void cas_lock_all(struct cas *cp)