From d575f032bbdb929cb5b1c9e1811fb75686f04828 Mon Sep 17 00:00:00 2001 From: Simon Xue Date: Thu, 25 May 2023 09:25:19 +0800 Subject: [PATCH] soc: rockchip: cma_procfs: fix build error for kernel 6.1 Change-Id: I53a19847d07969e7cec36eacfe0b57c556f5016a Signed-off-by: Simon Xue --- drivers/soc/rockchip/rk_cma_procfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/soc/rockchip/rk_cma_procfs.c b/drivers/soc/rockchip/rk_cma_procfs.c index 3fbfef095834..b2e48b5718c4 100644 --- a/drivers/soc/rockchip/rk_cma_procfs.c +++ b/drivers/soc/rockchip/rk_cma_procfs.c @@ -47,11 +47,12 @@ static void cma_procfs_show_bitmap(struct seq_file *s, struct cma *cma) static u64 cma_procfs_used_get(struct cma *cma) { + unsigned long flags; unsigned long used; - mutex_lock(&cma->lock); + spin_lock_irqsave(&cma->lock, flags); used = bitmap_weight(cma->bitmap, (int)cma_bitmap_maxno(cma)); - mutex_unlock(&cma->lock); + spin_unlock_irqrestore(&cma->lock, flags); return (u64)used << cma->order_per_bit; }