Messages in this thread Patch in this message |  | | Date | Mon, 24 Jun 2019 21:00:43 +1000 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the akpm-current tree |
| |
Hi Andrew,
After merging the akpm-current tree, today's linux-next build (arm multi_v7_defconfig) failed like this:
mm/util.c: In function '__account_locked_vm': mm/util.c:372:2: error: implicit declaration of function 'lockdep_assert_held_exclusive'; did you mean 'lockdep_assert_held_once'? [-Werror=implicit-function-declaration] lockdep_assert_held_exclusive(&mm->mmap_sem); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ lockdep_assert_held_once cc1: some warnings being treated as errors
Caused by commit
610509219f27 ("mm-add-account_locked_vm-utility-function-v3")
interacting with commit
9ffbe8ac05db ("locking/lockdep: Rename lockdep_assert_held_exclusive() -> lockdep_assert_held_write()")
from the tip tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 24 Jun 2019 20:57:23 +1000 Subject: [PATCH] merge fix for "locking/lockdep: Rename lockdep_assert_held_exclusive() -> lockdep_assert_held_write()"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- mm/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/util.c b/mm/util.c index 021648a8a3a3..932b00a7c28e 100644 --- a/mm/util.c +++ b/mm/util.c @@ -369,7 +369,7 @@ int __account_locked_vm(struct mm_struct *mm, unsigned long pages, bool inc, unsigned long locked_vm, limit; int ret = 0; - lockdep_assert_held_exclusive(&mm->mmap_sem); + lockdep_assert_held_write(&mm->mmap_sem); locked_vm = mm->locked_vm; if (inc) { -- 2.20.1 -- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] |  |