![]() | |||||||||||
Messages in this thread Patch in this message |
> Thanks. > > So we're taking ps2->cmd_mutex and then we're recurring back into > ps2_command() and then taking ps2->serio->cmd_mutex. > > I suspect that's all correct/natural/expected and needs another > make-lockdep-shut-up patch. 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 Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> --- drivers/input/serio/libps2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6.17-rc5-mm2/drivers/input/serio/libps2.c =================================================================== --- linux-2.6.17-rc5-mm2.orig/drivers/input/serio/libps2.c +++ linux-2.6.17-rc5-mm2/drivers/input/serio/libps2.c @@ -177,7 +177,7 @@ int ps2_command(struct ps2dev *ps2dev, u 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; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ | ||||||||||
| Last update: 2006-06-03 10:53 [from the cache] ©2003-2008 | |||||||||||