Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965081AbbLCMoO (ORCPT ); Thu, 3 Dec 2015 07:44:14 -0500 Received: from smtprelay2.synopsys.com ([198.182.60.111]:47647 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760186AbbLCMm2 (ORCPT ); Thu, 3 Dec 2015 07:42:28 -0500 From: Vineet Gupta To: CC: , , , Vineet Gupta Subject: [PATCH 03/17] ARC: dw2 unwind: Remove handling of for signal frame Date: Thu, 3 Dec 2015 18:11:01 +0530 Message-ID: <1449146475-15335-4-git-send-email-vgupta@synopsys.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449146475-15335-1-git-send-email-vgupta@synopsys.com> References: <1449146475-15335-1-git-send-email-vgupta@synopsys.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.12.197.182] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2521 Lines: 71 Signed-off-by: Vineet Gupta --- arch/arc/include/asm/unwind.h | 3 --- arch/arc/kernel/unwind.c | 11 ++--------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/arch/arc/include/asm/unwind.h b/arch/arc/include/asm/unwind.h index 0e7f48e2686a..559ef55abce1 100644 --- a/arch/arc/include/asm/unwind.h +++ b/arch/arc/include/asm/unwind.h @@ -116,9 +116,6 @@ struct unwind_frame_info { PTREGS_INFO(r31), \ PTREGS_INFO(r63) -#define UNW_DEFAULT_RA(raItem, dataAlign) \ - ((raItem).where == Memory && !((raItem).value * (dataAlign) + 4)) - extern int arc_unwind(struct unwind_frame_info *frame); extern void arc_unwind_init(void); extern void arc_unwind_setup(void); diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c index 44983b4d9e78..2f4a67f5a863 100644 --- a/arch/arc/kernel/unwind.c +++ b/arch/arc/kernel/unwind.c @@ -869,7 +869,7 @@ int arc_unwind(struct unwind_frame_info *frame) #define FRAME_REG(r, t) (((t *)frame)[reg_info[r].offs]) const u32 *fde = NULL, *cie = NULL; const u8 *ptr = NULL, *end = NULL; - unsigned long pc = UNW_PC(frame) - frame->call_frame; + unsigned long pc = UNW_PC(frame); unsigned long startLoc = 0, endLoc = 0, cfa; unsigned i; signed ptrType = -1; @@ -988,7 +988,6 @@ int arc_unwind(struct unwind_frame_info *frame) state.cieEnd = ptr; /* keep here temporarily */ ptr = (const u8 *)(cie + 2); end = (const u8 *)(cie + 1) + *cie; - frame->call_frame = 1; if ((state.version = *ptr) != 1) cie = NULL; /* unsupported version */ else if (*++ptr) { @@ -1003,7 +1002,7 @@ int arc_unwind(struct unwind_frame_info *frame) case 'R': continue; case 'S': - frame->call_frame = 0; + /* signal frame not handled */ continue; default: break; @@ -1147,12 +1146,6 @@ int arc_unwind(struct unwind_frame_info *frame) unw_debug("\n"); #endif - /* update frame */ -#ifndef CONFIG_AS_CFI_SIGNAL_FRAME - if (frame->call_frame - && !UNW_DEFAULT_RA(state.regs[retAddrReg], state.dataAlign)) - frame->call_frame = 0; -#endif cfa = FRAME_REG(state.cfa.reg, unsigned long) + state.cfa.offs; startLoc = min_t(unsigned long, UNW_SP(frame), cfa); endLoc = max_t(unsigned long, UNW_SP(frame), cfa); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/