diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2019-10-29 11:43:29 +0100 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2019-10-29 11:43:29 +0100 |
| commit | 822bbba0cabb50825a0ce22707dc45eb82d02853 (patch) | |
| tree | ea61d4ca72cb60b4cae8e95f64eefa7cd2a36603 /drivers/s390/cio/cio.h | |
| parent | Documentation/scheduler: fix links in sched-stats (diff) | |
| parent | Linux 5.4-rc4 (diff) | |
| download | linux-822bbba0cabb50825a0ce22707dc45eb82d02853.tar.xz linux-822bbba0cabb50825a0ce22707dc45eb82d02853.zip | |
Merge tag 'v5.4-rc4' into docs-next
I need to pick up the independent changes made to
Documentation/core-api/memory-allocation.rst to be able to merge further
work without creating a total mess.
Diffstat (limited to 'drivers/s390/cio/cio.h')
| -rw-r--r-- | drivers/s390/cio/cio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h index ba7d2480613b..dcdaba689b20 100644 --- a/drivers/s390/cio/cio.h +++ b/drivers/s390/cio/cio.h @@ -113,6 +113,7 @@ struct subchannel { enum sch_todo todo; struct work_struct todo_work; struct schib_config config; + u64 dma_mask; char *driver_override; /* Driver name to force a match */ } __attribute__ ((aligned(8))); |