go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #375 from jmgao:master 

PiperOrigin-RevId: 257041876
This commit is contained in:
gVisor bot 2019-07-08 13:41:00 -07:00
parent 659bebab8e b915a25597
commit c2cebbc8da
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runsc/boot/loader.go
View File

@ -262,7 +262,7 @@ func New(args Args) (*Loader, error) {
// Adjust the total memory returned by the Sentry so that applications that
// use /proc/meminfo can make allocations based on this limit.
usage.MinimumTotalMemoryBytes = args.TotalMem
log.Infof("Setting total memory to %.2f GB", float64(args.TotalMem)/(2^30))
log.Infof("Setting total memory to %.2f GB", float64(args.TotalMem)/(1<<30))
}
// Initiate the Kernel object, which is required by the Context passed

1
test/util/test_util.cc
View File

@ -231,6 +231,7 @@ void TestInit(int* argc, char*** argv) {
sa.sa_handler = SIG_IGN;
TEST_CHECK(sigaction(SIGPIPE, &sa, nullptr) == 0);
}
gvisor:case-end
} // namespace testing
} // namespace gvisor