From 6578ecb316f198bae11212df8aa0bd679cec16f5 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 10 Feb 2016 10:14:04 +1100 Subject: [PATCH] kernel/memremap.c: add new arg to dev_WARN Fixes: ee49ac85bc24b946 ("treewide: let dev_WARN() accept a condition") Cc: Felipe Balbi Cc: Greg Kroah-Hartman Cc: Jiri Kosina Signed-off-by: Andrew Morton --- kernel/memremap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/memremap.c b/kernel/memremap.c index ba845c368876..49c82d4301cb 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -226,9 +226,11 @@ static void devm_memremap_pages_release(struct device *dev, void *data) resource_size_t align_start, align_size; struct dev_pagemap *pgmap = &page_map->pgmap; - if (dev_WARN(dev, percpu_ref_tryget_live(pgmap->ref), - "%s: page mapping is still live!\n", __func__)) + if (percpu_ref_tryget_live(pgmap->ref)) { + dev_WARN(dev, true, "%s: page mapping is still live!\n", + __func__); percpu_ref_put(pgmap->ref); + } /* pages are dead and unused, undo the arch mapping */ align_start = res->start & ~(SECTION_SIZE - 1); -- 2.39.5