mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-09-18 23:09:29 +02:00
BackMerge tag 'v7.2' into drm-next
Linux 7.2 There was a lot of conflicts this round between fixes and next, and I'd like to get the merge resolutions that we have in drm-tip. Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
@@ -120,6 +120,9 @@ static struct damon_ctx *damon_sample_mtier_build_ctx(bool promote)
|
||||
addr.end = promote ? node1_end_addr : node0_end_addr;
|
||||
}
|
||||
|
||||
if (addr.start >= addr.end)
|
||||
goto free_out;
|
||||
|
||||
range.start = addr.start;
|
||||
range.end = addr.end;
|
||||
|
||||
@@ -153,6 +156,9 @@ static struct damon_ctx *damon_sample_mtier_build_ctx(bool promote)
|
||||
if (!scheme)
|
||||
goto free_out;
|
||||
damon_set_schemes(ctx, &scheme, 1);
|
||||
/* zero target value causes division by zero in damos_quota_store() */
|
||||
if (!node0_mem_used_bp || !node0_mem_free_bp)
|
||||
goto free_out;
|
||||
quota_goal = damos_new_quota_goal(
|
||||
promote ? DAMOS_QUOTA_NODE_MEM_USED_BP :
|
||||
DAMOS_QUOTA_NODE_MEM_FREE_BP,
|
||||
|
||||
@@ -232,8 +232,8 @@ static int __init ftrace_ops_sample_init(void)
|
||||
ops_destroy(ops_irrelevant, nr_ops_irrelevant);
|
||||
|
||||
/*
|
||||
* The benchmark completed sucessfully, but there's no reason to keep
|
||||
* the module around. Return an error do the user doesn't have to
|
||||
* The benchmark completed successfully, but there's no reason to keep
|
||||
* the module around. Return an error so the user doesn't have to
|
||||
* manually unload the module.
|
||||
*/
|
||||
return -EINVAL;
|
||||
|
||||
Reference in New Issue
Block a user