Unverified Commit ce6828fa authored by Matt Redfearn's avatar Matt Redfearn Committed by James Hogan
Browse files

MIPS: VDSO: Replace __mips_isa_rev with MIPS_ISA_REV 



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

Signed-off-by: default avatarMatt Redfearn <matt.redfearn@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/18678/


Signed-off-by: default avatarJames Hogan <jhogan@kernel.org>
parent 13b8638b

arch/mips/vdso/elf.S

+4 −6
Original line number Original line Diff line number Diff line
@@ -10,6 +10,8 @@ 




#include "vdso.h"

#include "vdso.h"





#include <asm/isa-rev.h>



#include <linux/elfnote.h>

#include <linux/elfnote.h>

#include <linux/version.h>

#include <linux/version.h>
@@ -40,11 +42,7 @@ __mips_abiflags: 
	.byte	__mips		/* isa_level */

	.byte	__mips		/* isa_level */





	/* isa_rev */

	/* isa_rev */

#ifdef __mips_isa_rev

	.byte	MIPS_ISA_REV

	.byte	__mips_isa_rev

#else

	.byte	0

#endif





	/* gpr_size */

	/* gpr_size */

#ifdef __mips64

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

#endif





	/* cpr1_size */

	/* 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 */

	.byte	2		/* AFL_REG_64 */

#else

#else

	.byte	1		/* AFL_REG_32 */

	.byte	1		/* AFL_REG_32 */