diff options
| author | Tom Zanussi <zanussi@kernel.org> | 2019-05-21 15:32:17 -0500 |
|---|---|---|
| committer | Tom Zanussi <zanussi@kernel.org> | 2019-05-21 15:32:17 -0500 |
| commit | 5c0a92ddb7a2516aeac60ebc8e5638eef7eb0228 (patch) | |
| tree | bf414094214835cc64549a4d21838b07f4142166 /drivers/s390/char/raw3270.c | |
| parent | 7e4eec4a8da1e85c9baebdddf4a8af31d7653263 (diff) | |
| parent | 6b1ae527b1fdee86e81da0cb26ced75731c6c0fa (diff) | |
| download | linux-rt-5c0a92ddb7a2516aeac60ebc8e5638eef7eb0228.tar.gz | |
Merge tag 'v3.18.140' into v3.18-rt-work
This is the 3.18.140 stable release
Diffstat (limited to 'drivers/s390/char/raw3270.c')
| -rw-r--r-- | drivers/s390/char/raw3270.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c index 220acb4cbee5..9c350e6d75bf 100644 --- a/drivers/s390/char/raw3270.c +++ b/drivers/s390/char/raw3270.c @@ -956,7 +956,7 @@ raw3270_deactivate_view(struct raw3270_view *view) * 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; @@ -978,6 +978,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); + lockdep_set_subclass(&view->lock, subclass); list_add(&view->list, &rp->view_list); rc = 0; spin_unlock_irqrestore(get_ccwdev_lock(rp->cdev), flags); |