Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 375759
b: refs/heads/master
c: e7438c4
h: refs/heads/master
i:
  375757: d80d02a
  375755: 5188530
  375751: f5dc497
  375743: c87b830
v: v3
  • Loading branch information
Tony Wu authored and Ralf Baechle committed May 17, 2013
1 parent 58e91f3 commit a3d2a53
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d552b233f692416d63bb93eb35bf24e5c95c7e0b
refs/heads/master: e7438c4b893e87311d2fb0facb3e6a0df17abe01
6 changes: 4 additions & 2 deletions trunk/arch/mips/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ static inline int is_ra_save_ins(union mips_instruction *ip)
#endif
}

static inline int is_jal_jalr_jr_ins(union mips_instruction *ip)
static inline int is_jump_ins(union mips_instruction *ip)
{
#ifdef CONFIG_CPU_MICROMIPS
/*
Expand All @@ -288,6 +288,8 @@ static inline int is_jal_jalr_jr_ins(union mips_instruction *ip)
return 0;
return (((ip->u_format.uimmediate >> 6) & mm_jalr_op) == mm_jalr_op);
#else
if (ip->j_format.opcode == j_op)
return 1;
if (ip->j_format.opcode == jal_op)
return 1;
if (ip->r_format.opcode != spec_op)
Expand Down Expand Up @@ -350,7 +352,7 @@ static int get_frame_info(struct mips_frame_info *info)

for (i = 0; i < max_insns; i++, ip++) {

if (is_jal_jalr_jr_ins(ip))
if (is_jump_ins(ip))
break;
if (!info->frame_size) {
if (is_sp_move_ins(ip))
Expand Down

0 comments on commit a3d2a53

Please sign in to comment.