diff options
author | Steven J. Hill <sjhill@mips.com> | 2012-09-13 17:51:46 -0400 |
---|---|---|
committer | Steven J. Hill <sjhill@mips.com> | 2012-09-13 18:00:34 -0400 |
commit | 05857c64ecf897209c16ffad9bb3e8d359dd5dca (patch) | |
tree | e62c65d30be08409bb48ac6f9969ef083443e0aa /arch/mips/mm/fault.c | |
parent | b2ab4f08e84d4031f82255447180c559bd076bbf (diff) |
MIPS: Replace 'kernel_uses_smartmips_rixi' with 'cpu_has_rixi'.
Remove usage of the 'kernel_uses_smartmips_rixi' macro from all files
and use new 'cpu_has_rixi' instead.
Signed-off-by: Steven J. Hill <sjhill@mips.com>
Acked-by: David Daney <david.daney@cavium.com>
Diffstat (limited to 'arch/mips/mm/fault.c')
-rw-r--r-- | arch/mips/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c index c14f6dfed995..7a19957735e9 100644 --- a/arch/mips/mm/fault.c +++ b/arch/mips/mm/fault.c | |||
@@ -114,7 +114,7 @@ good_area: | |||
114 | if (!(vma->vm_flags & VM_WRITE)) | 114 | if (!(vma->vm_flags & VM_WRITE)) |
115 | goto bad_area; | 115 | goto bad_area; |
116 | } else { | 116 | } else { |
117 | if (kernel_uses_smartmips_rixi) { | 117 | if (cpu_has_rixi) { |
118 | if (address == regs->cp0_epc && !(vma->vm_flags & VM_EXEC)) { | 118 | if (address == regs->cp0_epc && !(vma->vm_flags & VM_EXEC)) { |
119 | #if 0 | 119 | #if 0 |
120 | pr_notice("Cpu%d[%s:%d:%0*lx:%ld:%0*lx] XI violation\n", | 120 | pr_notice("Cpu%d[%s:%d:%0*lx:%ld:%0*lx] XI violation\n", |