summaryrefslogtreecommitdiffhomepage
path: root/vdso/vdso.cc
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-04-21 14:26:08 -0700
committergVisor bot <gvisor-bot@google.com>2020-04-21 14:26:08 -0700
commiteba086642e466f275b1f2df1284997b2ba0c28dc (patch)
treec23a4c9d047d4b4cc219000094976c5ca912e59f /vdso/vdso.cc
parent89822a446161f1ccb3b84d53f8528bc8b0a28053 (diff)
parentfe001edb14e6e879ab4ebca0d2ac71d770ac8cce (diff)
Merge pull request #1818 from lubinszARM:pr_signal_1
PiperOrigin-RevId: 307680200
Diffstat (limited to 'vdso/vdso.cc')
-rw-r--r--vdso/vdso.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/vdso/vdso.cc b/vdso/vdso.cc
index c2585d592..3b6653b5d 100644
--- a/vdso/vdso.cc
+++ b/vdso/vdso.cc
@@ -69,6 +69,12 @@ int __common_gettimeofday(struct timeval* tv, struct timezone* tz) {
}
} // namespace
+// __kernel_rt_sigreturn() implements rt_sigreturn()
+extern "C" void __kernel_rt_sigreturn(unsigned long unused) {
+ // No optimizations yet, just make the real system call.
+ sys_rt_sigreturn();
+}
+
#if __x86_64__
// __vdso_clock_gettime() implements clock_gettime()
@@ -143,12 +149,6 @@ extern "C" int __kernel_clock_getres(clockid_t clock, struct timespec* res) {
return ret;
}
-// __kernel_rt_sigreturn() implements gettimeofday()
-extern "C" int __kernel_rt_sigreturn(unsigned long unused) {
- // No optimizations yet, just make the real system call.
- return sys_rt_sigreturn();
-}
-
#else
#error "unsupported architecture"
#endif