From: Greg Kroah-Hartman Date: Fri, 6 Nov 2015 05:57:39 +0000 (-0800) Subject: 3.14-stable patches X-Git-Tag: v3.10.93~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a32b383b5d3856bf93523250f14fc1046b740335;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: revert-arm64-unwind-fix-pc-calculation.patch --- diff --git a/queue-3.14/revert-arm64-unwind-fix-pc-calculation.patch b/queue-3.14/revert-arm64-unwind-fix-pc-calculation.patch new file mode 100644 index 00000000000..5e95d4a7f45 --- /dev/null +++ b/queue-3.14/revert-arm64-unwind-fix-pc-calculation.patch @@ -0,0 +1,44 @@ +From 9702970c7bd3e2d6fecb642a190269131d4ac16c Mon Sep 17 00:00:00 2001 +From: Will Deacon +Date: Wed, 28 Oct 2015 16:56:13 +0000 +Subject: Revert "ARM64: unwind: Fix PC calculation" + +From: Will Deacon + +commit 9702970c7bd3e2d6fecb642a190269131d4ac16c upstream. + +This reverts commit e306dfd06fcb44d21c80acb8e5a88d55f3d1cf63. + +With this patch applied, we were the only architecture making this sort +of adjustment to the PC calculation in the unwinder. This causes +problems for ftrace, where the PC values are matched against the +contents of the stack frames in the callchain and fail to match any +records after the address adjustment. + +Whilst there has been some effort to change ftrace to workaround this, +those patches are not yet ready for mainline and, since we're the odd +architecture in this regard, let's just step in line with other +architectures (like arch/arm/) for now. + +Signed-off-by: Will Deacon +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/kernel/stacktrace.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +--- a/arch/arm64/kernel/stacktrace.c ++++ b/arch/arm64/kernel/stacktrace.c +@@ -48,11 +48,7 @@ int unwind_frame(struct stackframe *fram + + frame->sp = fp + 0x10; + frame->fp = *(unsigned long *)(fp); +- /* +- * -4 here because we care about the PC at time of bl, +- * not where the return will go. +- */ +- frame->pc = *(unsigned long *)(fp + 8) - 4; ++ frame->pc = *(unsigned long *)(fp + 8); + + return 0; + } diff --git a/queue-3.14/series b/queue-3.14/series index 141ac10bdce..43a0d01f18e 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -18,3 +18,4 @@ iio-mxs-lradc-fix-temperature-offset.patch rbd-require-stable-pages-if-message-data-crcs-are-enabled.patch rbd-don-t-leak-parent_spec-in-rbd_dev_probe_parent.patch rbd-prevent-kernel-stack-blow-up-on-rbd-map.patch +revert-arm64-unwind-fix-pc-calculation.patch