The patch titled
Subject: sched-loadavg-consolidate-load_int-load_frac-calc_load-fix
has been added to the -mm tree. Its filename is
sched-loadavg-consolidate-load_int-load_frac-calc_load-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/sched-loadavg-consolidate-load_int-load_frac-calc_load-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/sched-loadavg-consolidate-load_int-load_frac-calc_load-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
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>
---
block/blk-iolatency.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/block/blk-iolatency.c~sched-loadavg-consolidate-load_int-load_frac-calc_load-fix
+++ a/block/blk-iolatency.c
@@ -139,7 +139,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
@@ -503,7 +503,7 @@ static void iolatency_check_latencies(st
lat_info = &parent->child_lat;
/*
- * 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
@@ -512,7 +512,7 @@ static void iolatency_check_latencies(st
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.mean);
+ calc_load(iolat->lat_avg, iolatency_exp_factors[exp_idx], stat.mean);
/* Everything is ok and we don't need to adjust the scale. */
if (stat.mean <= iolat->min_lat_nsec &&
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
fix-crash-on-ocfs2_duplicate_clusters_by_page-v5-checkpatch-fixes.patch
proc-kcore-fix-invalid-memory-access-in-multi-page-read-optimization-v3-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
fix-clusters-leak-in-ocfs2_defrag_extent-fix.patch
mm.patch
mmpage_alloc-pf_wq_worker-threads-must-sleep-at-should_reclaim_retry-fix.patch
sched-loadavg-consolidate-load_int-load_frac-calc_load-fix.patch
mm-calculate-deferred-pages-after-skipping-mirrored-memory-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
lib-bitmapc-fix-remaining-space-computation-in-bitmap_print_to_pagebuf-fix.patch
lib-bitmapc-fix-remaining-space-computation-in-bitmap_print_to_pagebuf-fix-fix.patch
ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
arch-x86-kernel-cpu-commonc-fix-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
