From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Mar 2016 17:47:45 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=72aafdf01d826ad9e6fbd52bf689be937679f5d6;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

Pull s390 updates from Martin Schwidefsky:

 - Add the CPU id for the new z13s machine

 - Add a s390 specific XOR template for RAID-5 checksumming based on the
   XC instruction.  Remove all other alternatives, XC is always faster

 - The merge of our four different stack tracers into a single one

 - Tidy up the code related to page tables, several large inline
   functions are now out-of-line.  Bloat-o-meter reports ~11K text size
   reduction

 - A binary interface for the priviledged CLP instruction to retrieve
   the hardware view of the installed PCI functions

 - Improvements for the dasd format code

 - Bug fixes and cleanups

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (31 commits)
  s390/pci: enforce fmb page boundary rule
  s390: fix floating pointer register corruption (again)
  s390/cpumf: add missing lpp magic initialization
  s390: Fix misspellings in comments
  s390/mm: split arch/s390/mm/pgtable.c
  s390/mm: uninline pmdp_xxx functions from pgtable.h
  s390/mm: uninline ptep_xxx functions from pgtable.h
  s390/pci: add ioctl interface for CLP
  s390: Use pr_warn instead of pr_warning
  s390/dasd: remove casts to dasd_*_private
  s390/dasd: Refactor dasd format functions
  s390/dasd: Simplify code in format logic
  s390/dasd: Improve dasd format code
  s390/percpu: remove this_cpu_cmpxchg_double_4
  s390/cpumf: Improve guest detection heuristics
  s390/fault: merge report_user_fault implementations
  s390/dis: use correct escape sequence for '%' character
  s390/kvm: simplify set_guest_storage_key
  s390/oprofile: add z13/z13s model numbers
  s390: add z13s model number to z13 elf platform
  ...
---

72aafdf01d826ad9e6fbd52bf689be937679f5d6
diff --cc arch/s390/kvm/kvm-s390.c
index e196582fe87d,be1f0288443e..668c087513e5
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@@ -281,12 -281,10 +282,12 @@@ static void kvm_s390_sync_dirty_log(str
  	for (cur_gfn = memslot->base_gfn; cur_gfn <= last_gfn; cur_gfn++) {
  		address = gfn_to_hva_memslot(memslot, cur_gfn);
  
- 		if (gmap_test_and_clear_dirty(address, gmap))
+ 		if (test_and_clear_guest_dirty(gmap->mm, address))
  			mark_page_dirty(kvm, cur_gfn);
 +		if (fatal_signal_pending(current))
 +			return;
 +		cond_resched();
  	}
 -	up_read(&gmap->mm->mmap_sem);
  }
  
  /* Section: vm related */