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

Merge tag 's390-6.1-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Alexander Gordeev:

 - Fix size of incorrectly increased from four to eight bytes TOD field
   of crash dump save area. As result in case of kdump NT_S390_TODPREG
   ELF notes section contains correct value and "detected read beyond
   size of field" compiler warning goes away.

 - Fix memory leak in cryptographic Adjunct Processors (AP) module on
   initialization failure path.

 - Add Gerald Schaefer <gerald.schaefer@linux.ibm.com> and Alexander
   Gordeev <agordeev@linux.ibm.com> as S390 memory management
   maintainers. Also rename the S390 section to S390 ARCHITECTURE to be
   a bit more precise.

* tag 's390-6.1-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  MAINTAINERS: add S390 MM section
  s390/crashdump: fix TOD programmable field size
  s390/ap: fix memory leak in ap_init_qci_info()
parents 081f359e adba1a9b

MAINTAINERS

+10 −1
Original line number Diff line number Diff line
@@ -18011,7 +18011,7 @@ L: linux-fbdev@vger.kernel.org 
S:	Maintained

F:	drivers/video/fbdev/savage/









S390









S390 ARCHITECTURE









M:	Heiko Carstens <hca@linux.ibm.com>









M:	Vasily Gorbik <gor@linux.ibm.com>









M:	Alexander Gordeev <agordeev@linux.ibm.com>








@@ -18066,6 +18066,15 @@ L:	netdev@vger.kernel.org







S:	Supported









F:	drivers/s390/net/

















S390 MM









M:	Alexander Gordeev <agordeev@linux.ibm.com>









M:	Gerald Schaefer <gerald.schaefer@linux.ibm.com>









L:	linux-s390@vger.kernel.org









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git









F:	arch/s390/include/asm/pgtable.h









F:	arch/s390/mm

















S390 PCI SUBSYSTEM









M:	Niklas Schnelle <schnelle@linux.ibm.com>









M:	Gerald Schaefer <gerald.schaefer@linux.ibm.com>

























arch/s390/kernel/crash_dump.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -46,7 +46,7 @@ struct save_area {







	u64 fprs[16];









	u32 fpc;









	u32 prefix;









	u64 todpreg;









	u32 todpreg;









	u64 timer;









	u64 todcmp;









	u64 vxrs_low[16];
































drivers/s390/crypto/ap_bus.c



+4
−1






























Original line number
Diff line number
Diff line







@@ -233,8 +233,11 @@ static void __init ap_init_qci_info(void)







	if (!ap_qci_info)









		return;









	ap_qci_info_old = kzalloc(sizeof(*ap_qci_info_old), GFP_KERNEL);









	if (!ap_qci_info_old)









	if (!ap_qci_info_old) {









		kfree(ap_qci_info);









		ap_qci_info = NULL;









		return;









	}









	if (ap_fetch_qci_info(ap_qci_info) != 0) {









		kfree(ap_qci_info);









		kfree(ap_qci_info_old);