diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-25 08:44:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-25 08:44:27 -0700 |
commit | eeb7c41d9d7c0902accb1d481fe78d84d30c69cc (patch) | |
tree | 208fe8d2afd8fa70abfe5a815f5f5cb357856bad /drivers/s390/cio/chp.c | |
parent | 520eccdfe187591a51ea9ab4c1a024ae4d0f68d9 (diff) | |
parent | 97ca7bfc19605bc08e9183441b8b8545e84032d6 (diff) | |
download | linux-eeb7c41d9d7c0902accb1d481fe78d84d30c69cc.tar.gz linux-eeb7c41d9d7c0902accb1d481fe78d84d30c69cc.tar.bz2 linux-eeb7c41d9d7c0902accb1d481fe78d84d30c69cc.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Three bug fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/mm: set change and reference bit on lazy key enablement
s390: chp: handle CRW_ERC_INIT for channel-path status change
s390/perf: fix problem state detection
Diffstat (limited to 'drivers/s390/cio/chp.c')
-rw-r--r-- | drivers/s390/cio/chp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c index 7e0d4f724dda..432fc40990bd 100644 --- a/drivers/s390/cio/chp.c +++ b/drivers/s390/cio/chp.c @@ -559,6 +559,7 @@ static void chp_process_crw(struct crw *crw0, struct crw *crw1, chpid.id = crw0->rsid; switch (crw0->erc) { case CRW_ERC_IPARM: /* Path has come. */ + case CRW_ERC_INIT: if (!chp_is_registered(chpid)) chp_new(chpid); chsc_chp_online(chpid); |