openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2018-10-21 22:10:51 -07:00
parent 794b88e047
commit 3fe5d7e861
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/sparc/vdso/vclock_gettime.c
View File

@ -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)