diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-02-12 20:12:44 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-02-12 20:12:44 +0300 |
| commit | a4fd49cdb5495f36a35bd27b69b3806e383c719b (patch) | |
| tree | d579a6462e9c82f757717c454a72c715aa63933f | |
| parent | 4a387c98b3abc7cf9a2281f01f9b4dd7dbc48f65 (diff) | |
| parent | dd9cb842fa9d90653a9b48aba52f89c069f3bc50 (diff) | |
| download | linux-a4fd49cdb5495f36a35bd27b69b3806e383c719b.tar.xz | |
Merge tag 's390-5.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Vasily Gorbik:
"Maintainers and reviewers changes:
- Add Alexander Gordeev as maintainer for s390.
- Christian Borntraeger will focus on s390 KVM maintainership and
stays as s390 reviewer.
Fixes:
- Fix clang build of modules loader KUnit test.
- Fix kernel panic in CIO code on FCES path-event when no driver is
attached to a device or the driver does not provide the path_event
function"
* tag 's390-5.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/cio: verify the driver availability for path_event call
s390/module: fix building test_modules_helpers.o with clang
MAINTAINERS: downgrade myself to Reviewer for s390
MAINTAINERS: add Alexander Gordeev as maintainer for s390
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | arch/s390/lib/test_modules.c | 3 | ||||
| -rw-r--r-- | arch/s390/lib/test_modules.h | 3 | ||||
| -rw-r--r-- | drivers/s390/cio/device.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d164cc317b63..fca970a46e77 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16833,8 +16833,8 @@ F: drivers/video/fbdev/savage/ S390 M: Heiko Carstens <hca@linux.ibm.com> M: Vasily Gorbik <gor@linux.ibm.com> -M: Christian Borntraeger <borntraeger@linux.ibm.com> -R: Alexander Gordeev <agordeev@linux.ibm.com> +M: Alexander Gordeev <agordeev@linux.ibm.com> +R: Christian Borntraeger <borntraeger@linux.ibm.com> R: Sven Schnelle <svens@linux.ibm.com> L: linux-s390@vger.kernel.org S: Supported diff --git a/arch/s390/lib/test_modules.c b/arch/s390/lib/test_modules.c index d056baa8fbb0..9894009fc1f2 100644 --- a/arch/s390/lib/test_modules.c +++ b/arch/s390/lib/test_modules.c @@ -5,9 +5,6 @@ #include "test_modules.h" -#define DECLARE_RETURN(i) int test_modules_return_ ## i(void) -REPEAT_10000(DECLARE_RETURN); - /* * Test that modules with many relocations are loaded properly. */ diff --git a/arch/s390/lib/test_modules.h b/arch/s390/lib/test_modules.h index 43b5e4b4af3e..6371fcf17684 100644 --- a/arch/s390/lib/test_modules.h +++ b/arch/s390/lib/test_modules.h @@ -47,4 +47,7 @@ __REPEAT_10000_1(f, 8); \ __REPEAT_10000_1(f, 9) +#define DECLARE_RETURN(i) int test_modules_return_ ## i(void) +REPEAT_10000(DECLARE_RETURN); + #endif diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index cd938a26b76c..3b1cd0c96a74 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c @@ -1180,7 +1180,7 @@ static int io_subchannel_chp_event(struct subchannel *sch, else path_event[chpid] = PE_NONE; } - if (cdev) + if (cdev && cdev->drv && cdev->drv->path_event) cdev->drv->path_event(cdev, path_event); break; } |