summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2026-10-09 21:44:33 +0200
committerMark Brown <broonie@kernel.org>2026-10-09 21:44:33 +0200
commit2eb5e554541e70e7c846b5bcd1ba795272ce3f1b (patch)
treec6a2b11ff0cb7bc08f6c0c8c2ec38b388a034e24 /kernel
parentf8848ccec9ef94ce2ffc5a48d46c2d79e6808830 (diff)
parent6d318db9ffcb611f9b3b6b3201c963690541a943 (diff)
downloadlinux-next-2eb5e554541e70e7c846b5bcd1ba795272ce3f1b.tar.gz
linux-next-2eb5e554541e70e7c846b5bcd1ba795272ce3f1b.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 */