| @@ -231,16 +231,11 @@ static inline int calc_load_read_idx(void) · 230 unmodified lines |
| 231 | return calc_load_idx & 1; | 231 | return calc_load_idx & 1; |
| 232 | } | 232 | } |
| 233 | | 233 | |
| 234 | void calc_load_nohz_start(void) | 234 | static void calc_load_nohz_fold(struct rq *rq) |
| 235 | { | 235 | { |
| 236 | struct rq *this_rq = this_rq(); | | |
| 237 | long delta; | 236 | long delta; |
| 238 | | 237 | |
| 239 | /* | 238 | delta = calc_load_fold_active(rq, 0); |
| 240 | * We're going into NO_HZ mode, if there's any pending delta, fold it | | |
| 241 | * into the pending NO_HZ delta. | | |
| 242 | */ | | |
| 243 | delta = calc_load_fold_active(this_rq, 0); | | |
| 244 | if (delta) { | 239 | if (delta) { |
| 245 | int idx = calc_load_write_idx(); | 240 | int idx = calc_load_write_idx(); |
| 246 | | 241 | |
| @@ -248,6 +243,24 @@ void calc_load_nohz_start(void) · 1 unmodified line |
| 248 | } | 243 | } |
| 249 | } | 244 | } |
| 250 | | 245 | |
| | 246 | void calc_load_nohz_start(void) |
| | 247 | { |
| | 248 | /* |
| | 249 | * We're going into NO_HZ mode, if there's any pending delta, fold it |
| | 250 | * into the pending NO_HZ delta. |
| | 251 | */ |
| | 252 | calc_load_nohz_fold(this_rq()); |
| | 253 | } |
| | 254 | |
| | 255 | /* |
| | 256 | * Keep track of the load for NOHZ_FULL, must be called between |
| | 257 | * calc_load_nohz_{start,stop}(). |
| | 258 | */ |
| | 259 | void calc_load_nohz_remote(struct rq *rq) |
| | 260 | { |
| | 261 | calc_load_nohz_fold(rq); |
| | 262 | } |
| | 263 | |
| 251 | void calc_load_nohz_stop(void) | 264 | void calc_load_nohz_stop(void) |
| 252 | { | 265 | { |
| 253 | struct rq *this_rq = this_rq(); | 266 | struct rq *this_rq = this_rq(); |
| @@ -268,7 +281,7 @@ void calc_load_nohz_stop(void) · 14 unmodified lines |
| 268 | this_rq->calc_load_update += LOAD_FREQ; | 281 | this_rq->calc_load_update += LOAD_FREQ; |
| 269 | } | 282 | } |
| 270 | | 283 | |
| 271 | static long calc_load_nohz_fold(void) | 284 | static long calc_load_nohz_read(void) |
| 272 | { | 285 | { |
| 273 | int idx = calc_load_read_idx(); | 286 | int idx = calc_load_read_idx(); |
| 274 | long delta = 0; | 287 | long delta = 0; |
| @@ -323,7 +336,7 @@ static void calc_global_nohz(void) · 48 unmodified lines |
| 323 | } | 336 | } |
| 324 | #else /* !CONFIG_NO_HZ_COMMON */ | 337 | #else /* !CONFIG_NO_HZ_COMMON */ |
| 325 | | 338 | |
| 326 | static inline long calc_load_nohz_fold(void) { return 0; } | 339 | static inline long calc_load_nohz_read(void) { return 0; } |
| 327 | static inline void calc_global_nohz(void) { } | 340 | static inline void calc_global_nohz(void) { } |
| 328 | | 341 | |
| 329 | #endif /* CONFIG_NO_HZ_COMMON */ | 342 | #endif /* CONFIG_NO_HZ_COMMON */ |
| @@ -346,7 +359,7 @@ void calc_global_load(unsigned long ticks) · 16 unmodified lines |
| 346 | /* | 359 | /* |
| 347 | * Fold the 'old' NO_HZ-delta to include all NO_HZ CPUs. | 360 | * Fold the 'old' NO_HZ-delta to include all NO_HZ CPUs. |
| 348 | */ | 361 | */ |
| 349 | delta = calc_load_nohz_fold(); | 362 | delta = calc_load_nohz_read(); |
| 350 | if (delta) | 363 | if (delta) |
| 351 | atomic_long_add(delta, &calc_load_tasks); | 364 | atomic_long_add(delta, &calc_load_tasks); |
| 352 | | 365 | |