From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Apr 2015 17:15:33 +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=b19a42e3cb9e73cad59e60ab7403e5afe7f4b262;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

Pull more s390 updates from Martin Schwidefsky:
 "The big thing in this second merge for s390 is the new eBPF JIT from
  Michael which replaces the old 32-bit backend.

  The remaining commits are bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/pci: add locking for fmb access
  s390/pci: extract software counters from fmb
  s390/dasd: Fix unresumed device after suspend/resume having no paths
  s390/dasd: fix unresumed device after suspend/resume
  s390/dasd: fix inability to set a DASD device offline
  s390/mm: Fix memory hotplug for unaligned standby memory
  s390/bpf: Add s390x eBPF JIT compiler backend
  s390: Use bool function return values of true/false not 1/0
---

b19a42e3cb9e73cad59e60ab7403e5afe7f4b262
diff --cc arch/s390/pci/pci_debug.c
index c22d4402ae45,3fc9b4d90b59..4129b0a5fd78
--- a/arch/s390/pci/pci_debug.c
+++ b/arch/s390/pci/pci_debug.c
@@@ -45,9 -58,11 +58,12 @@@ static int pci_perf_show(struct seq_fil
  
  	if (!zdev)
  		return 0;
+ 
+ 	mutex_lock(&zdev->lock);
  	if (!zdev->fmb) {
+ 		mutex_unlock(&zdev->lock);
 -		return seq_printf(m, "FMB statistics disabled\n");
 +		seq_puts(m, "FMB statistics disabled\n");
 +		return 0;
  	}
  
  	/* header */