diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-06-16 13:56:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-16 13:56:23 +0200 |
| commit | 616aab60855dc2d84a5ad8b52aa4ecab182d7f18 (patch) | |
| tree | d0158d6562235838f29a963f272b95fb6c77bfde /src/basic/util.h | |
| parent | 732cd53eebdcefa1484c43a99455904b3692f9a4 (diff) | |
| parent | 0e2e03c67a8b9df2ae7c785741b2b5ac7a2a4f2b (diff) | |
Merge pull request #3481 from poettering/relative-memcg
various changes, most importantly regarding memory metrics
Diffstat (limited to 'src/basic/util.h')
| -rw-r--r-- | src/basic/util.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/basic/util.h b/src/basic/util.h index 9e6df19ef1..db105197e8 100644 --- a/src/basic/util.h +++ b/src/basic/util.h @@ -184,6 +184,7 @@ int namespace_open(pid_t pid, int *pidns_fd, int *mntns_fd, int *netns_fd, int * int namespace_enter(int pidns_fd, int mntns_fd, int netns_fd, int userns_fd, int root_fd); uint64_t physical_memory(void); +uint64_t physical_memory_scale(uint64_t v, uint64_t max); int update_reboot_parameter_and_warn(const char *param); |