5.16.3, 5.15.17, 5.10.94, 5.4.174

This commit is contained in:
Tk-Glitch
2022-01-27 15:47:47 +01:00
parent f4aefe779c
commit b55b43e77b
8 changed files with 21 additions and 21 deletions

View File

@@ -999,7 +999,7 @@ index 5a55d2300452..76b956661488 100644
+#else
if (task_nice(p) > 0) {
+#endif
cpustat[CPUTIME_NICE] += cputime;
task_group_account_field(p, CPUTIME_NICE, cputime);
cpustat[CPUTIME_GUEST_NICE] += cputime;
} else {
@@ -269,7 +278,7 @@ static inline u64 account_other_time(u64 max)

View File

@@ -8111,7 +8111,7 @@ index 5a55d2300452..66a0ab7165f0 100644
/* Add guest time to cpustat. */
- if (task_nice(p) > 0) {
+ if (task_running_nice(p)) {
cpustat[CPUTIME_NICE] += cputime;
task_group_account_field(p, CPUTIME_NICE, cputime);
cpustat[CPUTIME_GUEST_NICE] += cputime;
} else {
@@ -269,7 +269,7 @@ static inline u64 account_other_time(u64 max)

View File

@@ -9187,7 +9187,7 @@ index 872e481d5098..f920c8b48ec1 100644
/* Add guest time to cpustat. */
- if (task_nice(p) > 0) {
+ if (task_running_nice(p)) {
cpustat[CPUTIME_NICE] += cputime;
task_group_account_field(p, CPUTIME_NICE, cputime);
cpustat[CPUTIME_GUEST_NICE] += cputime;
} else {
@@ -270,7 +270,7 @@ static inline u64 account_other_time(u64 max)

View File

@@ -9210,7 +9210,7 @@ index 9392aea1804e..c1ead972e498 100644
/* Add guest time to cpustat. */
- if (task_nice(p) > 0) {
+ if (task_running_nice(p)) {
cpustat[CPUTIME_NICE] += cputime;
task_group_account_field(p, CPUTIME_NICE, cputime);
cpustat[CPUTIME_GUEST_NICE] += cputime;
} else {
@@ -270,7 +270,7 @@ static inline u64 account_other_time(u64 max)

View File

@@ -1018,7 +1018,7 @@ index 46ed4e1383e2..0a9548ee995c 100644
+#else
if (task_nice(p) > 0) {
+#endif
cpustat[CPUTIME_NICE] += cputime;
task_group_account_field(p, CPUTIME_NICE, cputime);
cpustat[CPUTIME_GUEST_NICE] += cputime;
} else {
@@ -269,7 +278,7 @@ static inline u64 account_other_time(u64 max)

View File

@@ -7292,7 +7292,7 @@ index 46ed4e1383e2..51460a446da0 100644
/* Add guest time to cpustat. */
- if (task_nice(p) > 0) {
+ if (task_running_nice(p)) {
cpustat[CPUTIME_NICE] += cputime;
task_group_account_field(p, CPUTIME_NICE, cputime);
cpustat[CPUTIME_GUEST_NICE] += cputime;
} else {
@@ -269,7 +269,7 @@ static inline u64 account_other_time(u64 max)