tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds d94467ae 27fb892d

+3
+2
arch/s390/mm/fault.c
··· 441 441 if (rc) 442 442 BUG(); 443 443 } else { 444 + if (faulthandler_disabled()) 445 + return handle_fault_error_nolock(regs, 0); 444 446 mm = current->mm; 445 447 mmap_read_lock(mm); 446 448 vma = find_vma(mm, addr);
+1
drivers/crypto/Kconfig
··· 180 180 depends on PKEY 181 181 select CRYPTO_ALGAPI 182 182 select CRYPTO_SKCIPHER 183 + select CRYPTO_ENGINE 183 184 help 184 185 This is the s390 hardware accelerated implementation of the 185 186 AES cipher algorithms for use with protected key.