From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Nov 2019 01:23:53 +0000 (-0800)
Subject: Merge tag 's390-5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: microblaze-v5.6-rc1~195
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=ea1f56fa16ae5f6e67f6ea03836b36c6053d33d1;p=linux-2.6-microblaze.git

Merge tag 's390-5.5-1' of git://git./linux/kernel/git/s390/linux

Pull s390 updates from Vasily Gorbik:

 - Adjust PMU device drivers registration to avoid WARN_ON and few other
   perf improvements.

 - Enhance tracing in vfio-ccw.

 - Few stack unwinder fixes and improvements, convert get_wchan custom
   stack unwinding to generic api usage.

 - Fixes for mm helpers issues uncovered with tests validating
   architecture page table helpers.

 - Fix noexec bit handling when hardware doesn't support it.

 - Fix memleak and unsigned value compared with zero bugs in crypto
   code. Minor code simplification.

 - Fix crash during kdump with kasan enabled kernel.

 - Switch bug and alternatives from asm to asm_inline to improve
   inlining decisions.

 - Use 'depends on cc-option' for MARCH and TUNE options in Kconfig, add
   z13s and z14 ZR1 to TUNE descriptions.

 - Minor head64.S simplification.

 - Fix physical to logical CPU map for SMT.

 - Several cleanups in qdio code.

 - Other minor cleanups and fixes all over the code.

* tag 's390-5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (41 commits)
  s390/cpumf: Adjust registration of s390 PMU device drivers
  s390/smp: fix physical to logical CPU map for SMT
  s390/early: move access registers setup in C code
  s390/head64: remove unnecessary vdso_per_cpu_data setup
  s390/early: move control registers setup in C code
  s390/kasan: support memcpy_real with TRACE_IRQFLAGS
  s390/crypto: Fix unsigned variable compared with zero
  s390/pkey: use memdup_user() to simplify code
  s390/pkey: fix memory leak within _copy_apqns_from_user()
  s390/disassembler: don't hide instruction addresses
  s390/cpum_sf: Assign error value to err variable
  s390/cpum_sf: Replace function name in debug statements
  s390/cpum_sf: Use consistant debug print format for sampling
  s390/unwind: drop unnecessary code around calling ftrace_graph_ret_addr()
  s390: add error handling to perf_callchain_kernel
  s390: always inline current_stack_pointer()
  s390/mm: add mm_pxd_folded() checks to pxd_free()
  s390/mm: properly clear _PAGE_NOEXEC bit when it is not supported
  s390/mm: simplify page table helpers for large entries
  s390/mm: make pmd/pud_bad() report large entries as bad
  ...
---

ea1f56fa16ae5f6e67f6ea03836b36c6053d33d1
diff --cc arch/s390/kernel/unwind_bc.c
index a8204f952315,5699e820c621..fa111d3d378f
--- a/arch/s390/kernel/unwind_bc.c
+++ b/arch/s390/kernel/unwind_bc.c
@@@ -144,15 -133,9 +139,10 @@@ void __unwind_start(struct unwind_stat
  		sf = (struct stack_frame *) sp;
  		ip = READ_ONCE_NOCHECK(sf->gprs[8]);
  		reliable = false;
 +		reuse_sp = false;
  	}
  
- #ifdef CONFIG_FUNCTION_GRAPH_TRACER
- 	/* Decode any ftrace redirection */
- 	if (ip == (unsigned long) return_to_handler)
- 		ip = ftrace_graph_ret_addr(state->task, &state->graph_idx,
- 					   ip, NULL);
- #endif
+ 	ip = ftrace_graph_ret_addr(state->task, &state->graph_idx, ip, NULL);
  
  	/* Update unwind state */
  	state->sp = sp;