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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Martin Schwidefsky:
 "The bulk of the s390 patches for 4.13. Some new things but mostly bug
  fixes and cleanups. Noteworthy changes:

   - The SCM block driver is converted to blk-mq

   - Switch s390 to 5 level page tables. The virtual address space for a
     user space process can now have up to 16EB-4KB.

   - Introduce a ELF phdr flag for qemu to avoid the global
     vm.alloc_pgste which forces all processes to large page tables

   - A couple of PCI improvements to improve error recovery

   - Included is the merge of the base support for proper machine checks
     for KVM"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (52 commits)
  s390/dasd: Fix faulty ENODEV for RO sysfs attribute
  s390/pci: recognize name clashes with uids
  s390/pci: provide more debug information
  s390/pci: fix handling of PEC 306
  s390/pci: improve pci hotplug
  s390/pci: introduce clp_get_state
  s390/pci: improve error handling during fmb (de)registration
  s390/pci: improve unreg_ioat error handling
  s390/pci: improve error handling during interrupt deregistration
  s390/pci: don't cleanup in arch_setup_msi_irqs
  KVM: s390: Backup the guest's machine check info
  s390/nmi: s390: New low level handling for machine check happening in guest
  s390/fpu: export save_fpu_regs for all configs
  s390/kvm: avoid global config of vm.alloc_pgste=1
  s390: rename struct psw_bits members
  s390: rename psw_bits enums
  s390/mm: use correct address space when enabling DAT
  s390/cio: introduce io_subchannel_type
  s390/ipl: revert Load Normal semantics for LPAR CCW-type re-IPL
  s390/dumpstack: remove raw stack dump
  ...
parents e5859eb8 9e293b5a

arch/s390/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ config ARCH_SUPPORTS_UPROBES 


config S390

	def_bool y

	select ARCH_BINFMT_ELF_STATE

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_GCOV_PROFILE_ALL
@@ -184,7 +185,7 @@ config SCHED_OMIT_FRAME_POINTER 


config PGTABLE_LEVELS

	int

	default 4

	default 5



source "init/Kconfig"

arch/s390/crypto/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ obj-$(CONFIG_CRYPTO_SHA1_S390) += sha1_s390.o sha_common.o 
obj-$(CONFIG_CRYPTO_SHA256_S390) += sha256_s390.o sha_common.o

obj-$(CONFIG_CRYPTO_SHA512_S390) += sha512_s390.o sha_common.o

obj-$(CONFIG_CRYPTO_DES_S390) += des_s390.o

obj-$(CONFIG_CRYPTO_AES_S390) += aes_s390.o paes_s390.o

obj-$(CONFIG_CRYPTO_AES_S390) += aes_s390.o

obj-$(CONFIG_CRYPTO_PAES_S390) += paes_s390.o

obj-$(CONFIG_S390_PRNG) += prng.o

obj-$(CONFIG_CRYPTO_GHASH_S390) += ghash_s390.o

obj-$(CONFIG_CRYPTO_CRC32_S390) += crc32-vx_s390.o

arch/s390/crypto/arch_random.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <linux/kernel.h>

#include <linux/atomic.h>

#include <linux/random.h>

#include <linux/static_key.h>

#include <asm/cpacf.h>

arch/s390/include/asm/Kbuild

+2 −0
Original line number Diff line number Diff line 
generic-y += asm-offsets.h

generic-y += cacheflush.h

generic-y += clkdev.h

generic-y += device.h

generic-y += dma-contiguous.h

generic-y += div64.h

generic-y += emergency-restart.h

generic-y += export.h

generic-y += fb.h

generic-y += irq_regs.h

generic-y += irq_work.h

generic-y += kmap_types.h

arch/s390/include/asm/device.h

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
/*

 * Arch specific extensions to struct device

 *

 * This file is released under the GPLv2

 */

struct dev_archdata {

};



struct pdev_archdata {

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE