Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a966610 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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.
parents 7555c5d5 27faeebd

arch/sparc/vdso/vclock_gettime.c

+11 −1
Original line number Diff line number Diff line
@@ -33,9 +33,19 @@ 
#define	TICK_PRIV_BIT	(1ULL << 63)

#endif



#ifdef	CONFIG_SPARC64

#define SYSCALL_STRING							\

	"ta	0x6d;"							\

	"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						\

	"f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",			\

arch/sparc/vdso/vma.c

+3 −1
Original line number Diff line number Diff line
@@ -262,7 +262,9 @@ static __init int vdso_setup(char *s) 
	unsigned long val;



	err = kstrtoul(s, 10, &val);

	vdso_enabled = val;

	if (err)

		return err;

	vdso_enabled = val;

	return 0;

}

__setup("vdso=", vdso_setup);