diff options
| author | Mark Brown <broonie@kernel.org> | 2026-05-29 17:54:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-05-29 17:54:33 +0100 |
| commit | 18a549b897f99757e5ec7ed570222de21c36285f (patch) | |
| tree | 3ad8f162aac9dc9dcbb07a50b050f08272f209d9 /drivers | |
| parent | 1eb7867715322670ed08997d90ecd153ac5fbe4f (diff) | |
| parent | cfaef29c20e86738aec28641b6de1e078298999e (diff) | |
| download | linux-next-history-18a549b897f99757e5ec7ed570222de21c36285f.tar.gz | |
Merge branch 'mm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dax/kmem.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_managed.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/dax/kmem.c b/drivers/dax/kmem.c index 2cc8749bc8711..a18e2b968e4da 100644 --- a/drivers/dax/kmem.c +++ b/drivers/dax/kmem.c @@ -227,6 +227,12 @@ static void dev_dax_kmem_remove(struct dev_dax *dev_dax) if (rc) continue; + /* range was never added during probe */ + if (!data->res[i]) { + success++; + continue; + } + rc = remove_memory(range.start, range_len(&range)); if (rc == 0) { remove_resource(data->res[i]); diff --git a/drivers/gpu/drm/drm_managed.c b/drivers/gpu/drm/drm_managed.c index 247f468731de0..a9da94319b052 100644 --- a/drivers/gpu/drm/drm_managed.c +++ b/drivers/gpu/drm/drm_managed.c @@ -232,8 +232,8 @@ void *drmm_kmalloc(struct drm_device *dev, size_t size, gfp_t gfp) dr = alloc_dr(NULL, size, gfp, dev_to_node(dev->dev)); if (!dr) { - drm_dbg_drmres(dev, "failed to allocate %zu bytes, %u flags\n", - size, gfp); + drm_dbg_drmres(dev, "failed to allocate %zu bytes, %pGg\n", + size, &gfp); return NULL; } dr->node.name = kstrdup_const("kmalloc", gfp); |