Commit a4fd49cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4a387c98 dd9cb842

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/s390/lib/test_modules.c

+0 −3
Original line number Diff line number Diff line
@@ -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.

 */

arch/s390/lib/test_modules.h

+3 −0
Original line number Diff line number Diff line
@@ -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

drivers/s390/cio/device.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}