Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 23:20:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Browse Source 
David writes:
  "Sparc fixes:

   The main bit here is fixing how fallback system calls are handled in
   the sparc vDSO.

   Unfortunately, I fat fingered the commit and some perf debugging
   hacks slipped into the vDSO fix, which I revert in the very next
   commit."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Revert unintended perf changes.
  sparc: vDSO: Silence an uninitialized variable warning
  sparc: Fix syscall fallback bugs in VDSO.
This commit is contained in:
Greg Kroah-Hartman 2018-10-19 09:15:12 +02:00
commit 2a96661054
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,9 +33,19 @@
#define TICK_PRIV_BIT (1ULL << 63) #define TICK_PRIV_BIT (1ULL << 63)
#endif #endif
#ifdef CONFIG_SPARC64
#define SYSCALL_STRING \ #define SYSCALL_STRING \
"ta 0x6d;" \ "ta 0x6d;" \
"sub %%g0, %%o0, %%o0;" \ "bcs,a 1f;" \
" sub %%g0, %%o0, %%o0;" \
"1:"
#else
#define SYSCALL_STRING \
"ta 0x10;" \
"bcs,a 1f;" \
" sub %%g0, %%o0, %%o0;" \
"1:"
#endif
#define SYSCALL_CLOBBERS \ #define SYSCALL_CLOBBERS \
"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", \ "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", \

4
arch/sparc/vdso/vma.c
View File

@ -262,7 +262,9 @@ static __init int vdso_setup(char *s)
unsigned long val; unsigned long val;
err = kstrtoul(s, 10, &val); err = kstrtoul(s, 10, &val);
if (err)
return err;
vdso_enabled = val; vdso_enabled = val;
return err; return 0;
} }
__setup("vdso=", vdso_setup); __setup("vdso=", vdso_setup);