diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-09 21:44:57 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-09 21:44:57 +0200 |
| commit | 03eef0e6409d844e3eb662765bf11e17529a24a2 (patch) | |
| tree | 9120f25ae7055f068dff3780ff835f08fd3b1b15 /kernel | |
| parent | 15be8e2f4b44f092c7a36c026642bc72d9993f15 (diff) | |
| parent | f2bf20011b95401f63e573d54134544c452c4117 (diff) | |
| download | linux-next-03eef0e6409d844e3eb662765bf11e17529a24a2.tar.gz linux-next-03eef0e6409d844e3eb662765bf11e17529a24a2.zip | |
Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git
# Conflicts:
# drivers/gpu/drm/vc4/vc4_v3d.c
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cgroup/dmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cgroup/dmem.c b/kernel/cgroup/dmem.c index 4683f3d68022..47a41646de4b 100644 --- a/kernel/cgroup/dmem.c +++ b/kernel/cgroup/dmem.c @@ -28,7 +28,7 @@ DEFINE_STATIC_SRCU(dmemcg_srcu); struct dmem_cgroup_region { /** * @ref: References keeping the region alive. - * Keeps the region reference alive after a succesful RCU lookup. + * Keeps the region reference alive after a successful RCU lookup. */ struct kref ref; @@ -696,7 +696,7 @@ EXPORT_SYMBOL_GPL(dmem_cgroup_uncharge); * dmem_cgroup_try_charge() - Try charging a new allocation to a region. * @region: dmem region to charge * @size: Size (in bytes) to charge. - * @ret_pool: On succesfull allocation, the pool that is charged. + * @ret_pool: On successful allocation, the pool that is charged. * @ret_limit_pool: On a failed allocation, the limiting pool. * * This function charges the @region region for a size of @size bytes. |