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

Merge tag 's390-6.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull more s390 updates from Heiko Carstens:

 - Add missing select CRYPTO_ENGINE to CRYPTO_PAES_S390

 - Fix secure storage access exception handling when fault handling is
   disabled

* tag 's390-6.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/mm: Fix in_atomic() handling in do_secure_storage_access()
  s390/crypto: Select crypto engine in Kconfig when PAES is chosen
parents 27fb892d 11709abc

arch/s390/mm/fault.c

+2 −0
Original line number Diff line number Diff line
@@ -441,6 +441,8 @@ void do_secure_storage_access(struct pt_regs *regs) 
		if (rc)

			BUG();

	} else {

		if (faulthandler_disabled())

			return handle_fault_error_nolock(regs, 0);

		mm = current->mm;

		mmap_read_lock(mm);

		vma = find_vma(mm, addr);

drivers/crypto/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ config CRYPTO_PAES_S390 
	depends on PKEY

	select CRYPTO_ALGAPI

	select CRYPTO_SKCIPHER

	select CRYPTO_ENGINE

	help

	  This is the s390 hardware accelerated implementation of the

	  AES cipher algorithms for use with protected key.