Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e46cae44 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 new features and main improvements in this merge for v4.9

   - Support for the UBSAN sanitizer

   - Set HAVE_EFFICIENT_UNALIGNED_ACCESS, it improves the code in some
     places

   - Improvements for the in-kernel fpu code, in particular the overhead
     for multiple consecutive in kernel fpu users is recuded

   - Add a SIMD implementation for the RAID6 gen and xor operations

   - Add RAID6 recovery based on the XC instruction

   - The PCI DMA flush logic has been improved to increase the speed of
     the map / unmap operations

   - The time synchronization code has seen some updates

  And bug fixes all over the place"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (48 commits)
  s390/con3270: fix insufficient space padding
  s390/con3270: fix use of uninitialised data
  MAINTAINERS: update DASD maintainer
  s390/cio: fix accidental interrupt enabling during resume
  s390/dasd: add missing \n to end of dev_err messages
  s390/config: Enable config options for Docker
  s390/dasd: make query host access interruptible
  s390/dasd: fix panic during offline processing
  s390/dasd: fix hanging offline processing
  s390/pci_dma: improve lazy flush for unmap
  s390/pci_dma: split dma_update_trans
  s390/pci_dma: improve map_sg
  s390/pci_dma: simplify dma address calculation
  s390/pci_dma: remove dma address range check
  iommu/s390: simplify registration of I/O address translation parameters
  s390: migrate exception table users off module.h and onto extable.h
  s390: export header for CLP ioctl
  s390/vmur: fix irq pointer dereference in int handler
  s390/dasd: add missing KOBJ_CHANGE event for unformatted devices
  s390: enable UBSAN
  ...
parents 02bafd96 6cd997db

MAINTAINERS

+2 −2
Original line number Original line Diff line number Diff line
@@ -10135,8 +10135,8 @@ S: Supported 
F:	drivers/s390/cio/

F:	drivers/s390/cio/





S390 DASD DRIVER

S390 DASD DRIVER

M:	Stefan Weinhuber <wein@de.ibm.com>

M:	Stefan Haberland <sth@linux.vnet.ibm.com>

M:	Stefan Haberland <stefan.haberland@de.ibm.com>

M:	Jan Hoeppner <hoeppner@linux.vnet.ibm.com>

L:	linux-s390@vger.kernel.org

L:	linux-s390@vger.kernel.org

W:	http://www.ibm.com/developerworks/linux/linux390/

W:	http://www.ibm.com/developerworks/linux/linux390/

S:	Supported

S:	Supported

arch/s390/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -73,6 +73,7 @@ config S390 
	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_KCOV

	select ARCH_HAS_KCOV

	select ARCH_HAS_SG_CHAIN

	select ARCH_HAS_SG_CHAIN

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select ARCH_INLINE_READ_LOCK

	select ARCH_INLINE_READ_LOCK

	select ARCH_INLINE_READ_LOCK_BH

	select ARCH_INLINE_READ_LOCK_BH
@@ -109,6 +110,7 @@ config S390 
	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_WANTS_DYNAMIC_TASK_STRUCT

	select ARCH_WANTS_DYNAMIC_TASK_STRUCT

	select ARCH_WANTS_PROT_NUMA_PROT_NONE

	select ARCH_WANTS_PROT_NUMA_PROT_NONE

	select ARCH_WANTS_UBSAN_NO_NULL

	select ARCH_WANT_IPC_PARSE_VERSION

	select ARCH_WANT_IPC_PARSE_VERSION

	select BUILDTIME_EXTABLE_SORT

	select BUILDTIME_EXTABLE_SORT

	select CLONE_BACKWARDS2

	select CLONE_BACKWARDS2
@@ -136,6 +138,7 @@ config S390 
	select HAVE_DMA_API_DEBUG

	select HAVE_DMA_API_DEBUG

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_EFFICIENT_UNALIGNED_ACCESS

	select HAVE_EXIT_THREAD

	select HAVE_EXIT_THREAD

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

arch/s390/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,8 @@ cflags-$(CONFIG_MARCH_Z196_TUNE) += -mtune=z196 
cflags-$(CONFIG_MARCH_ZEC12_TUNE)	+= -mtune=zEC12

cflags-$(CONFIG_MARCH_ZEC12_TUNE)	+= -mtune=zEC12

cflags-$(CONFIG_MARCH_Z13_TUNE)	+= -mtune=z13

cflags-$(CONFIG_MARCH_Z13_TUNE)	+= -mtune=z13





cflags-y += -Wa,-I$(srctree)/arch/$(ARCH)/include



#KBUILD_IMAGE is necessary for make rpm

#KBUILD_IMAGE is necessary for make rpm

KBUILD_IMAGE	:=arch/s390/boot/image

KBUILD_IMAGE	:=arch/s390/boot/image

arch/s390/appldata/appldata_base.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -542,7 +542,7 @@ static int __init appldata_init(void) 
		rc = PTR_ERR(appldata_pdev);

		rc = PTR_ERR(appldata_pdev);

		goto out_driver;

		goto out_driver;

	}

	}

	appldata_wq = create_singlethread_workqueue("appldata");

	appldata_wq = alloc_ordered_workqueue("appldata", 0);

	if (!appldata_wq) {

	if (!appldata_wq) {

		rc = -ENOMEM;

		rc = -ENOMEM;

		goto out_device;

		goto out_device;

arch/s390/boot/compressed/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ KBUILD_CFLAGS += $(call cc-option,-mpacked-stack) 
KBUILD_CFLAGS += $(call cc-option,-ffreestanding)

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





GCOV_PROFILE := n

GCOV_PROFILE := n

UBSAN_SANITIZE := n





OBJECTS := $(addprefix $(objtree)/arch/s390/kernel/, head.o sclp.o ebcdic.o als.o)

OBJECTS := $(addprefix $(objtree)/arch/s390/kernel/, head.o sclp.o ebcdic.o als.o)

OBJECTS += $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o

OBJECTS += $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o