[PATCH 4/4] MIPS: VDSO: Replace __mips_isa_rev with MIPS_ISA_REV

From: Matt Redfearn
Date: Mon Feb 26 2018 - 12:12:10 EST


Remove the need to check that __mips_isa_rev is defined by using the
newly added MIPS_ISA_REV.

Signed-off-by: Matt Redfearn <matt.redfearn@xxxxxxxx>
---

arch/mips/vdso/elf.S | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/mips/vdso/elf.S b/arch/mips/vdso/elf.S
index be37bbb1f061..428a1917afc6 100644
--- a/arch/mips/vdso/elf.S
+++ b/arch/mips/vdso/elf.S
@@ -10,6 +10,8 @@

#include "vdso.h"

+#include <asm/isa-rev.h>
+
#include <linux/elfnote.h>
#include <linux/version.h>

@@ -40,11 +42,7 @@ __mips_abiflags:
.byte __mips /* isa_level */

/* isa_rev */
-#ifdef __mips_isa_rev
- .byte __mips_isa_rev
-#else
- .byte 0
-#endif
+ .byte MIPS_ISA_REV

/* gpr_size */
#ifdef __mips64
@@ -54,7 +52,7 @@ __mips_abiflags:
#endif

/* cpr1_size */
-#if (defined(__mips_isa_rev) && __mips_isa_rev >= 6) || defined(__mips64)
+#if (MIPS_ISA_REV >= 6) || defined(__mips64)
.byte 2 /* AFL_REG_64 */
#else
.byte 1 /* AFL_REG_32 */
--
2.7.4