Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
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.
+14
-2
+11
-1
arch/sparc/vdso/vclock_gettime.c
+11
-1
arch/sparc/vdso/vclock_gettime.c
···
33
33
#define TICK_PRIV_BIT (1ULL << 63)
34
34
#endif
35
35
36
+
#ifdef CONFIG_SPARC64
36
37
#define SYSCALL_STRING \
37
38
"ta 0x6d;" \
38
-
"sub %%g0, %%o0, %%o0;" \
39
+
"bcs,a 1f;" \
40
+
" sub %%g0, %%o0, %%o0;" \
41
+
"1:"
42
+
#else
43
+
#define SYSCALL_STRING \
44
+
"ta 0x10;" \
45
+
"bcs,a 1f;" \
46
+
" sub %%g0, %%o0, %%o0;" \
47
+
"1:"
48
+
#endif
39
49
40
50
#define SYSCALL_CLOBBERS \
41
51
"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", \