diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2006-07-03 00:25:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 15:27:07 -0700 |
| commit | 3aceafc1e2596f1c2c4e053126561f00b68e3a1a (patch) | |
| tree | bd570bd077ef3e8ab43bf7904c40711cf42a8323 /drivers | |
| parent | f20dc5f7c1adf1c4b68b7672d6f2002cb824e636 (diff) | |
| download | kernel-crypto-3aceafc1e2596f1c2c4e053126561f00b68e3a1a.tar.gz kernel-crypto-3aceafc1e2596f1c2c4e053126561f00b68e3a1a.tar.xz kernel-crypto-3aceafc1e2596f1c2c4e053126561f00b68e3a1a.zip | |
[PATCH] lockdep: annotate serio
The PS/2 code has a natural device order and there is a one level recursion in
this device order in terms of the cmd_mutex; annotate this explicit recursion
as ok.
Has no effect on non-lockdep kernels.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Dmitry Torokhov <dtor_core@ameritech.net>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/serio/libps2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c index 79c97f94bcb..61a6f977846 100644 --- a/drivers/input/serio/libps2.c +++ b/drivers/input/serio/libps2.c @@ -177,7 +177,7 @@ int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command) return -1; } - mutex_lock(&ps2dev->cmd_mutex); + mutex_lock_nested(&ps2dev->cmd_mutex, SINGLE_DEPTH_NESTING); serio_pause_rx(ps2dev->serio); ps2dev->flags = command == PS2_CMD_GETID ? PS2_FLAG_WAITID : 0; |