From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Dec 2016 00:33:33 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2ec4584eb89b8933d1ee307f2fc9c42e745847d7;p=linux-beck.git

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

Pull s390 updates from Martin Schwidefsky:
 "The main bulk of the s390 patches for the 4.10 merge window:

   - Add support for the contiguous memory allocator.

   - The recovery for I/O errors in the dasd device driver is improved,
     the driver will now remove channel paths that are not working
     properly.

   - Additional fields are added to /proc/sysinfo, the extended
     partition name and the partition UUID.

   - New naming for PCI devices with system defined UIDs.

   - The last few remaining alloc_bootmem calls are converted to
     memblock.

   - The thread_info structure is stripped down and moved to the
     task_struct. The only field left in thread_info is the flags field.

   - Rework of the arch topology code to fix a fake numa issue.

   - Refactoring of the atomic primitives and add a new preempt_count
     implementation.

   - Clocksource steering for the STP sync check offsets.

   - The s390 specific headers are changed to make them usable with
     CLANG.

   - Bug fixes and cleanup"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (70 commits)
  s390/cpumf: Use configuration level indication for sampling data
  s390: provide memmove implementation
  s390: cleanup arch/s390/kernel Makefile
  s390: fix initrd corruptions with gcov/kcov instrumented kernels
  s390: exclude early C code from gcov profiling
  s390/dasd: channel path aware error recovery
  s390/dasd: extend dasd path handling
  s390: remove unused labels from entry.S
  s390/vmlogrdr: fix IUCV buffer allocation
  s390/crypto: unlock on error in prng_tdes_read()
  s390/sysinfo: show partition extended name and UUID if available
  s390/numa: pin all possible cpus to nodes early
  s390/numa: establish cpu to node mapping early
  s390/topology: use cpu_topology array instead of per cpu variable
  s390/smp: initialize cpu_present_mask in setup_arch
  s390/topology: always use s390 specific sched_domain_topology_level
  s390/smp: use smp_get_base_cpu() helper function
  s390/numa: always use logical cpu and core ids
  s390: Remove VLAIS in ptff() and clear_table()
  s390: fix machine check panic stack switch
  ...
---

2ec4584eb89b8933d1ee307f2fc9c42e745847d7
diff --cc arch/s390/Kconfig
index 028f97be5bae,2d05efa31df3..c6722112527d
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -169,9 -170,9 +170,10 @@@ config S39
  	select OLD_SIGSUSPEND3
  	select SPARSE_IRQ
  	select SYSCTL_EXCEPTION_TRACE
+ 	select THREAD_INFO_IN_TASK
  	select TTY
  	select VIRT_CPU_ACCOUNTING
 +	select ARCH_HAS_SCALED_CPUTIME
  	select VIRT_TO_BUS
  	select HAVE_NMI
  
diff --cc arch/s390/pci/pci_dma.c
index 6b2f72f523b9,54590207ae08..1d7a9c71944a
--- a/arch/s390/pci/pci_dma.c
+++ b/arch/s390/pci/pci_dma.c
@@@ -423,11 -425,10 +425,10 @@@ static int __s390_dma_map_sg(struct dev
  	dma_addr_t dma_addr_base, dma_addr;
  	int flags = ZPCI_PTE_VALID;
  	struct scatterlist *s;
 -	unsigned long pa;
 +	unsigned long pa = 0;
  	int ret;
  
- 	size = PAGE_ALIGN(size);
- 	dma_addr_base = dma_alloc_address(dev, size >> PAGE_SHIFT);
+ 	dma_addr_base = dma_alloc_address(dev, nr_pages);
  	if (dma_addr_base == DMA_ERROR_CODE)
  		return -ENOMEM;