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

Merge tag 's390-5.2-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Heiko Carstens:

 - Disable address-of-packed-member warning in s390 specific boot code
   to get rid of a gcc9 warning which otherwise is already disabled for
   the whole kernel.

 - Fix yet another compiler error seen with CONFIG_OPTIMIZE_INLINING
   enabled.

 - Fix memory leak in vfio-ccw code on module exit.

* tag 's390-5.2-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  vfio-ccw: Destroy kmem cache region on module exit
  s390/ctl_reg: mark __ctl_set_bit and __ctl_clear_bit as __always_inline
  s390/boot: disable address-of-packed-member warning
parents d72558b2 11aff183

arch/s390/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY 
KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float

KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables

KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-option,-ffreestanding)

KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, address-of-packed-member)

KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g)

KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,))

UTS_MACHINE	:= s390x

arch/s390/include/asm/ctl_reg.h

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
		: "i" (low), "i" (high));				\

} while (0)



static inline void __ctl_set_bit(unsigned int cr, unsigned int bit)

static __always_inline void __ctl_set_bit(unsigned int cr, unsigned int bit)

{

	unsigned long reg;
@@ -64,7 +64,7 @@ static inline void __ctl_set_bit(unsigned int cr, unsigned int bit) 
	__ctl_load(reg, cr, cr);

}



static inline void __ctl_clear_bit(unsigned int cr, unsigned int bit)

static __always_inline void __ctl_clear_bit(unsigned int cr, unsigned int bit)

{

	unsigned long reg;

drivers/s390/cio/vfio_ccw_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ static void __exit vfio_ccw_sch_exit(void) 
	css_driver_unregister(&vfio_ccw_sch_driver);

	isc_unregister(VFIO_CCW_ISC);

	kmem_cache_destroy(vfio_ccw_io_region);

	kmem_cache_destroy(vfio_ccw_cmd_region);

	destroy_workqueue(vfio_ccw_work_q);

}

module_init(vfio_ccw_sch_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE