Skip to content

Commit

Permalink
MIPS: VDSO: Replace __mips_isa_rev with MIPS_ISA_REV
Browse files Browse the repository at this point in the history
Remove the need to check that __mips_isa_rev is defined by using the
newly added MIPS_ISA_REV.

Signed-off-by: Matt Redfearn <[email protected]>
Cc: Ralf Baechle <[email protected]>
Cc: Paul Burton <[email protected]>
Cc: [email protected]
Patchwork: https://patchwork.linux-mips.org/patch/18678/
Signed-off-by: James Hogan <[email protected]>
  • Loading branch information
mpredfearn authored and amalon committed Mar 9, 2018
1 parent 13b8638 commit ce6828f
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions arch/mips/vdso/elf.S
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#include "vdso.h"

#include <asm/isa-rev.h>

#include <linux/elfnote.h>
#include <linux/version.h>

Expand Down Expand Up @@ -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
Expand All @@ -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 */
Expand Down

0 comments on commit ce6828f

Please sign in to comment.