summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/mm/mm.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-04-17 18:21:08 +0000
committergVisor bot <gvisor-bot@google.com>2020-04-17 18:21:08 +0000
commit0f9e6d074af4099c048ec9b31035cbc6cc30474d (patch)
tree2754312a82d8cf170efd9757965033e8c6bd5eee /pkg/sentry/mm/mm.go
parent0665b0af8fb412f3194d6faaa11a1721b0133b8e (diff)
parent80deebb0bfde2a53c943deb8d8473239bb6de3eb (diff)
Merge release-20200323.0-179-g80deebb (automated)
Diffstat (limited to 'pkg/sentry/mm/mm.go')
-rw-r--r--pkg/sentry/mm/mm.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/sentry/mm/mm.go b/pkg/sentry/mm/mm.go
index c2195ae11..34d3bde7a 100644
--- a/pkg/sentry/mm/mm.go
+++ b/pkg/sentry/mm/mm.go
@@ -231,6 +231,9 @@ type MemoryManager struct {
// before trying to activate the address space. When set to true, delays in
// activation are not reported as stuck tasks by the watchdog.
sleepForActivation bool
+
+ // vdsoSigReturnAddr is the address of 'vdso_sigreturn'.
+ vdsoSigReturnAddr uint64
}
// vma represents a virtual memory area.