diff options
| author | Markos Chandras <markos.chandras@imgtec.com> | 2014-11-14 05:05:41 -0500 |
|---|---|---|
| committer | Markos Chandras <markos.chandras@imgtec.com> | 2015-02-17 10:37:26 -0500 |
| commit | 6ebb496ffc7eeb309a1505bb980e6fb1499eebd7 (patch) | |
| tree | c3587938d1951a67b66b7d01cb67d08134c65fd3 /arch/mips/kernel | |
| parent | 8b8aa636f02879c5e3d4228109dc5a13a934d89b (diff) | |
MIPS: kernel: entry.S: Add MIPS R6 related definitions
The instruction hazard barrier in the form of:
jr.hb ra
nop
is valid on MIPS R6 as well.
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/entry.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S index 4353d323f017..d5ab21c3fd12 100644 --- a/arch/mips/kernel/entry.S +++ b/arch/mips/kernel/entry.S | |||
| @@ -158,7 +158,8 @@ syscall_exit_work: | |||
| 158 | jal syscall_trace_leave | 158 | jal syscall_trace_leave |
| 159 | b resume_userspace | 159 | b resume_userspace |
| 160 | 160 | ||
| 161 | #if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_MIPS_MT) | 161 | #if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6) || \ |
| 162 | defined(CONFIG_MIPS_MT) | ||
| 162 | 163 | ||
| 163 | /* | 164 | /* |
| 164 | * MIPS32R2 Instruction Hazard Barrier - must be called | 165 | * MIPS32R2 Instruction Hazard Barrier - must be called |
| @@ -171,4 +172,4 @@ LEAF(mips_ihb) | |||
| 171 | nop | 172 | nop |
| 172 | END(mips_ihb) | 173 | END(mips_ihb) |
| 173 | 174 | ||
| 174 | #endif /* CONFIG_CPU_MIPSR2 or CONFIG_MIPS_MT */ | 175 | #endif /* CONFIG_CPU_MIPSR2 or CONFIG_CPU_MIPSR6 or CONFIG_MIPS_MT */ |
