Commit 3fe5d7e8 authored by David S. Miller's avatar David S. Miller
Browse files

sparc: Don't bother masking out TICK_PRIV_BIT in VDSO code. 



If the TICK_PRIV_BIT was set, we would not be able to read the tick
register in user space, which is where this code runs.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 794b88e0

arch/sparc/vdso/vclock_gettime.c

+1 −8
Original line number Diff line number Diff line
@@ -26,13 +26,6 @@ 
#include <asm/clocksource.h>

#include <asm/vvar.h>



#undef	TICK_PRIV_BIT

#ifdef	CONFIG_SPARC64

#define	TICK_PRIV_BIT	(1UL << 63)

#else

#define	TICK_PRIV_BIT	(1ULL << 63)

#endif



#ifdef	CONFIG_SPARC64

#define SYSCALL_STRING							\

	"ta	0x6d;"							\
@@ -112,7 +105,7 @@ notrace static __always_inline u64 vread_tick(void) 
			     "rd		%%asr24, %0\n\t"

			     ".popsection\n"

			     : "=r" (ret));

	return ret & ~TICK_PRIV_BIT;

	return ret;

}

#else

notrace static __always_inline u64 vread_tick(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE