summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2026-09-30 13:10:39 +0100
committerMark Brown <broonie@kernel.org>2026-09-30 13:10:39 +0100
commit045d331be31c33b8fb3a96316ee552c549f3c59f (patch)
tree7927c8fdb6fcc6c98c261ae817d2e219836866ab /kernel
parent9124a3fb35820ea903fe24969a482899ee245449 (diff)
parentd1a93cf1d3bed4667de58a561afb9682430e4f50 (diff)
downloadlinux-next-045d331be31c33b8fb3a96316ee552c549f3c59f.tar.gz
linux-next-045d331be31c33b8fb3a96316ee552c549f3c59f.zip
Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/qos.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/qos.c b/kernel/power/qos.c
index 1944dbeb0d4c..c241da5bccf6 100644
--- a/kernel/power/qos.c
+++ b/kernel/power/qos.c
@@ -159,7 +159,7 @@ static void pm_qos_flags_remove_req(struct pm_qos_flags *pqf,
list_for_each_entry(req, &pqf->list, node)
val |= req->flags;
- pqf->effective_flags = val;
+ WRITE_ONCE(pqf->effective_flags, val);
}
/**
@@ -193,7 +193,7 @@ bool pm_qos_update_flags(struct pm_qos_flags *pqf,
req->flags = val;
INIT_LIST_HEAD(&req->node);
list_add_tail(&req->node, &pqf->list);
- pqf->effective_flags |= val;
+ WRITE_ONCE(pqf->effective_flags, pqf->effective_flags | val);
break;
default:
/* no action */