diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2017-03-12 08:11:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-12 08:11:42 +0000 |
| commit | c6e7fd7d72eeb7337c64fe24a6bc610fafe4e25c (patch) | |
| tree | 2d9a8190461cf7e2d4f308d123216e13cc2c2364 /arch/mips | |
| parent | b3ec549b786c8c72ec44832b81d52b5b921a6880 (diff) | |
| parent | 0d45490221a2497a5257414aecc85cfe19068c54 (diff) | |
MIPS: Clear ISA bit correctly in get_frame_info()
am: 0d45490221
Change-Id: I531d407a5a29d93c60ac199b7ff7d13ced328c05
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kernel/process.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index 44a6f25e902e..4770bc6c9978 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -299,17 +299,14 @@ static inline int is_sp_move_ins(union mips_instruction *ip) static int get_frame_info(struct mips_frame_info *info) { -#ifdef CONFIG_CPU_MICROMIPS - union mips_instruction *ip = (void *) (((char *) info->func) - 1); -#else - union mips_instruction *ip = info->func; -#endif + union mips_instruction *ip; unsigned max_insns = info->func_size / sizeof(union mips_instruction); unsigned i; info->pc_offset = -1; info->frame_size = 0; + ip = (void *)msk_isa16_mode((ulong)info->func); if (!ip) goto err; |