projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
drivers
/
s390
/
char
/
raw3270.c
diff --git
a/drivers/s390/char/raw3270.c
b/drivers/s390/char/raw3270.c
index
f8cd293
..
63a41b1
100644
(file)
--- a/
drivers/s390/char/raw3270.c
+++ b/
drivers/s390/char/raw3270.c
@@
-920,7
+920,7
@@
raw3270_deactivate_view(struct raw3270_view *view)
* Add view to device with minor "minor".
*/
int
* Add view to device with minor "minor".
*/
int
-raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor)
+raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor
, int subclass
)
{
unsigned long flags;
struct raw3270 *rp;
{
unsigned long flags;
struct raw3270 *rp;
@@
-942,6
+942,7
@@
raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor)
view->cols = rp->cols;
view->ascebc = rp->ascebc;
spin_lock_init(&view->lock);
view->cols = rp->cols;
view->ascebc = rp->ascebc;
spin_lock_init(&view->lock);
+ lockdep_set_subclass(&view->lock, subclass);
list_add(&view->list, &rp->view_list);
rc = 0;
spin_unlock_irqrestore(get_ccwdev_lock(rp->cdev), flags);
list_add(&view->list, &rp->view_list);
rc = 0;
spin_unlock_irqrestore(get_ccwdev_lock(rp->cdev), flags);