Merge branch 'hishamhm-pull-960'

This commit is contained in:
Nathan Scott
2020-08-20 14:19:53 +10:00
48 changed files with 155 additions and 155 deletions

View File

@ -34,7 +34,7 @@ typedef struct CPUData_ {
unsigned long long int softIrqTime;
unsigned long long int stealTime;
unsigned long long int guestTime;
unsigned long long int totalPeriod;
unsigned long long int userPeriod;
unsigned long long int systemPeriod;
@ -58,11 +58,11 @@ typedef struct TtyDriver_ {
typedef struct LinuxProcessList_ {
ProcessList super;
CPUData* cpus;
TtyDriver* ttyDrivers;
bool haveSmapsRollup;
#ifdef HAVE_DELAYACCT
struct nl_sock *netlink_socket;
int netlink_family;