The patch titled
Subject: sched-loadavg-consolidate-load_int-load_frac-calc_load-fix
has been removed from the -mm tree. Its filename was
sched-loadavg-consolidate-load_int-load_frac-calc_load-fix.patch
This patch was dropped because it was folded into sched-loadavg-consolidate-load_int-load_frac-calc_load.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: sched-loadavg-consolidate-load_int-load_frac-calc_load-fix
fix missed conversion in block/blk-iolatency.c
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
--- a/block/blk-iolatency.c~sched-loadavg-consolidate-load_int-load_frac-calc_load-fix
+++ a/block/blk-iolatency.c
@@ -153,7 +153,7 @@ struct iolatency_grp {
#define BLKIOLATENCY_MAX_WIN_SIZE NSEC_PER_SEC
/*
* These are the constants used to fake the fixed-point moving average
- * calculation just like load average. The call to CALC_LOAD folds
+ * calculation just like load average. The call to calc_load() folds
* (FIXED_1 (2048) - exp_factor) * new_sample into lat_avg. The sampling
* window size is bucketed to try to approximately calculate average
* latency such that 1/exp (decay rate) is [1 min, 2.5 min) when windows
@@ -248,7 +248,7 @@ static inline void iolat_update_total_la
return;
/*
- * CALC_LOAD takes in a number stored in fixed point representation.
+ * calc_load() takes in a number stored in fixed point representation.
* Because we are using this for IO time in ns, the values stored
* are significantly larger than the FIXED_1 denominator (2048).
* Therefore, rounding errors in the calculation are negligible and
@@ -257,7 +257,9 @@ static inline void iolat_update_total_la
exp_idx = min_t(int, BLKIOLATENCY_NR_EXP_FACTORS - 1,
div64_u64(iolat->cur_win_nsec,
BLKIOLATENCY_EXP_BUCKET_SIZE));
- CALC_LOAD(iolat->lat_avg, iolatency_exp_factors[exp_idx], stat->rqs.mean);
+ iolat->lat_avg = calc_load(iolat->lat_avg,
+ iolatency_exp_factors[exp_idx],
+ stat->rqs.mean);
}
static inline bool iolatency_may_queue(struct iolatency_grp *iolat,
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
sched-loadavg-consolidate-load_int-load_frac-calc_load.patch
mm-workingset-add-vmstat-counter-for-shadow-nodes-fix.patch
mm-workingset-add-vmstat-counter-for-shadow-nodes-fix-fix.patch
mm-mremap-downgrade-mmap_sem-to-read-when-shrinking-fix.patch
mm-brk-downgrade-mmap_sem-to-read-when-shrinking-fix.patch
memory_hotplug-free-pages-as-higher-order-fix.patch
mm-calculate-deferred-pages-after-skipping-mirrored-memory-fix.patch
mm-gup_benchmark-time-put_page-fix.patch
tools-gup_benchmark-allow-user-specified-file-fix.patch
mm-thp-fix-madv_dontneed-vs-migrate_misplaced_transhuge_page-race-condition-fix.patch
