diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-21 22:10:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-22 15:31:38 -0700 |
| commit | 3fe5d7e861286c0b80573f094e32dd9736370d69 (patch) | |
| tree | c6254cf072f47a06ac4385aaf0a20e68b1679dc1 | |
| parent | 794b88e047588965ad8f716245857b452f118e13 (diff) | |
| download | hid-3fe5d7e861286c0b80573f094e32dd9736370d69.tar.gz | |
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>
| -rw-r--r-- | arch/sparc/vdso/vclock_gettime.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/sparc/vdso/vclock_gettime.c b/arch/sparc/vdso/vclock_gettime.c index 75c49fcb57aa27..4e853d1582c71a 100644 --- a/arch/sparc/vdso/vclock_gettime.c +++ b/arch/sparc/vdso/vclock_gettime.c @@ -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) |