From: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
Date: Wed, 13 Oct 2010 18:35:40 +0000 (-0700)
Subject: Input: mousedev - correct lockdep annotation
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f74eef95e33a07379aa2b950c7f313cbfd55ebbe;p=deliverable%2Flinux.git

Input: mousedev - correct lockdep annotation

When annotating mutex to avoid false lockdep reports we should not
be using MOUSEDEV_MIX as lock subclass but rather SINGLE_DEPTH_NESTING.

Signed-off-by: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index d528a2dba064..98973340d042 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -866,7 +866,7 @@ static struct mousedev *mousedev_create(struct input_dev *dev,
 	spin_lock_init(&mousedev->client_lock);
 	mutex_init(&mousedev->mutex);
 	lockdep_set_subclass(&mousedev->mutex,
-			     minor == MOUSEDEV_MIX ? MOUSEDEV_MIX : 0);
+			     minor == MOUSEDEV_MIX ? SINGLE_DEPTH_NESTING : 0);
 	init_waitqueue_head(&mousedev->wait);
 
 	if (minor == MOUSEDEV_MIX)