Skip to content

Commit

Permalink
ARC: dw2 unwind: Don't bail for CIE.version != 1
Browse files Browse the repository at this point in the history
The rudimentary CIE.version == 3 handling is already present in code
(for return address register specification)

Signed-off-by: Vineet Gupta <[email protected]>
  • Loading branch information
vineetgarc committed Dec 21, 2015
1 parent 2d64aff commit 6d0d506
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions arch/arc/kernel/unwind.c
Original file line number Diff line number Diff line change
Expand Up @@ -600,9 +600,6 @@ static signed fde_pointer_type(const u32 *cie)
const u8 *ptr = (const u8 *)(cie + 2);
unsigned version = *ptr;

if (version != 1)
return -1; /* unsupported */

if (*++ptr) {
const char *aug;
const u8 *end = (const u8 *)(cie + 1) + *cie;
Expand Down Expand Up @@ -1014,9 +1011,7 @@ int arc_unwind(struct unwind_frame_info *frame)
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) {
if (*++ptr) {
/* check if augmentation size is first (thus present) */
if (*ptr == 'z') {
while (++ptr < end && *ptr) {
Expand Down

0 comments on commit 6d0d506

Please sign in to comment.