openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

dma_resv: prime lockdep annotations 

From d07ea81611ed6e4fb8cc290f42d23dbcca2da2f8 Mon Sep 17 00:00:00 2001
From: Steven Price <steven.price@arm.com>
Date: Mon, 11 Nov 2019 13:07:19 +0000
Subject: [PATCH] dma_resv: Correct return type of dma_resv_lockdep()

subsys_initcall() expects a function which returns 'int'. Fix
dma_resv_lockdep() so it returns an 'int' error code.

Fixes: b2a8116e25 ("dma_resv: prime lockdep annotations")
Signed-off-by: Steven Price <steven.price@arm.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/c0a0c70d-e6fe-1103-2888-1ce1425f4a5d@arm.com
This commit is contained in:
Steven Price 2019-11-11 13:11:20 +00:00 committed by Daniel Vetter
parent be14312472
commit ffbbaa7420
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/dma-buf/dma-resv.c
View File

@ -97,13 +97,13 @@ static void dma_resv_list_free(struct dma_resv_list *list)
}
#if IS_ENABLED(CONFIG_LOCKDEP)
static void __init dma_resv_lockdep(void)
static int __init dma_resv_lockdep(void)
{
struct mm_struct *mm = mm_alloc();
struct dma_resv obj;
if (!mm)
return;
return -ENOMEM;
dma_resv_init(&obj);
@ -115,6 +115,8 @@ static void __init dma_resv_lockdep(void)
up_read(&mm->mmap_sem);
mmput(mm);
return 0;
}
subsys_initcall(dma_resv_lockdep);
#endif