summaryrefslogtreecommitdiffhomepage
path: root/runsc/boot
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-07-08 04:39:27 +0000
committergVisor bot <gvisor-bot@google.com>2020-07-08 04:39:27 +0000
commitcd5ec7185bddade490180b0d1d177da8dbc24664 (patch)
tree807f5683eed7173952af35485e27126d44a5e813 /runsc/boot
parent8d88155b63275cc43ab26c8f6d81342850c4dacc (diff)
parentefa2615eb008a642dc542176759dc560c5f48a2d (diff)
Merge release-20200622.1-78-gefa2615eb (automated)
Diffstat (limited to 'runsc/boot')
-rw-r--r--runsc/boot/loader.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go
index b5df1deb9..0940d2a6d 100644
--- a/runsc/boot/loader.go
+++ b/runsc/boot/loader.go
@@ -227,9 +227,7 @@ func New(args Args) (*Loader, error) {
// Create VDSO.
//
// Pass k as the platform since it is savable, unlike the actual platform.
- //
- // FIXME(b/109889800): Use non-nil context.
- vdso, err := loader.PrepareVDSO(nil, k)
+ vdso, err := loader.PrepareVDSO(k)
if err != nil {
return nil, fmt.Errorf("creating vdso: %v", err)
}