diff options
| author | Daniel Lange <DLange@git.local> | 2021-10-15 09:03:05 +0200 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2021-10-15 09:03:05 +0200 |
| commit | c733b3f6130c70e100c21c4f77d8fd48db80622c (patch) | |
| tree | fac3278283232938169f928fd3d3ab641d5c6c8e /linux/Platform.c | |
| parent | 4582ae87a0a0675d0756b93dcda052c533cd2c96 (diff) | |
| parent | 30ce3b4c264c51c98f280e88e23792ff7deb2317 (diff) | |
| download | debian_htop-c733b3f6130c70e100c21c4f77d8fd48db80622c.tar.gz debian_htop-c733b3f6130c70e100c21c4f77d8fd48db80622c.tar.bz2 debian_htop-c733b3f6130c70e100c21c4f77d8fd48db80622c.zip | |
Update upstream source from tag 'upstream/3.1.1'
Update to upstream version '3.1.1'
with Debian dir c4b5e8f6455cfd05bffdaed787e2ebf5c7d9a632
Diffstat (limited to 'linux/Platform.c')
| -rw-r--r-- | linux/Platform.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/Platform.c b/linux/Platform.c index 05023d5..e305e7f 100644 --- a/linux/Platform.c +++ b/linux/Platform.c @@ -1,7 +1,7 @@ /* htop - linux/Platform.c (C) 2014 Hisham H. Muhammad -Released under the GNU GPLv2, see the COPYING file +Released under the GNU GPLv2+, see the COPYING file in the source distribution for its full text. */ @@ -331,8 +331,8 @@ void Platform_setMemoryValues(Meter* this) { const ProcessList* pl = this->pl; const LinuxProcessList* lpl = (const LinuxProcessList*) pl; - this->total = pl->totalMem > lpl->totalHugePageMem ? pl->totalMem - lpl->totalHugePageMem : pl->totalMem; - this->values[0] = pl->usedMem > lpl->totalHugePageMem ? pl->usedMem - lpl->totalHugePageMem : pl->usedMem; + this->total = pl->totalMem; + this->values[0] = pl->usedMem; this->values[1] = pl->buffersMem; this->values[2] = pl->sharedMem; this->values[3] = pl->cachedMem; |