diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-30 22:07:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 22:07:32 +0200 |
| commit | 680a3838748b297b7c3c462f98b58f82e39218e8 (patch) | |
| tree | 69eee4b7256c2ab592c8c982dd0d957e44e88a78 /libpod | |
| parent | e84ed3c1bca2a35f8b531473dafede7a2c624d0a (diff) | |
| parent | 32aaf8da56379c45abf6735ea68951ac526e3a51 (diff) | |
| download | podman-680a3838748b297b7c3c462f98b58f82e39218e8.tar.gz podman-680a3838748b297b7c3c462f98b58f82e39218e8.tar.bz2 podman-680a3838748b297b7c3c462f98b58f82e39218e8.zip | |
Merge pull request #3672 from petejohanson/32bit-build-fixes
Build fix for 32-bit systems.
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/stats.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/stats.go b/libpod/stats.go index 8101fbbbd..776870bd2 100644 --- a/libpod/stats.go +++ b/libpod/stats.go @@ -86,7 +86,8 @@ func getMemLimit(cgroupLimit uint64) uint64 { return cgroupLimit } - physicalLimit := si.Totalram + //nolint:unconvert + physicalLimit := uint64(si.Totalram) if cgroupLimit > physicalLimit { return physicalLimit } |