From b9636d608b6e79cce4629dfd46f9b6857591fa03 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Wed, 25 Apr 2012 11:03:50 +1000 Subject: [PATCH] mm/huge_memory.c: use lockdep_assert_held() Use lockdep_assert_held() to check for locks instead of an opencoded variant. Signed-off-by: Andi Kleen Acked-by: Hugh Dickins Cc: Andrea Arcangeli Signed-off-by: Andrew Morton --- mm/huge_memory.c | 4 ++-- mm/swap.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index d7d7165156ca..5e1aaac6bfea 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2078,7 +2078,7 @@ static void collect_mm_slot(struct mm_slot *mm_slot) { struct mm_struct *mm = mm_slot->mm; - VM_BUG_ON(NR_CPUS != 1 && !spin_is_locked(&khugepaged_mm_lock)); + lockdep_assert_held(&khugepaged_mm_lock); if (khugepaged_test_exit(mm)) { /* free mm_slot */ @@ -2108,7 +2108,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int progress = 0; VM_BUG_ON(!pages); - VM_BUG_ON(NR_CPUS != 1 && !spin_is_locked(&khugepaged_mm_lock)); + lockdep_assert_held(&khugepaged_mm_lock); if (khugepaged_scan.mm_slot) mm_slot = khugepaged_scan.mm_slot; diff --git a/mm/swap.c b/mm/swap.c index 60d14daa2b25..8ff73d83d38e 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -653,7 +653,7 @@ void lru_add_page_tail(struct zone* zone, VM_BUG_ON(!PageHead(page)); VM_BUG_ON(PageCompound(page_tail)); VM_BUG_ON(PageLRU(page_tail)); - VM_BUG_ON(NR_CPUS != 1 && !spin_is_locked(&zone->lru_lock)); + lockdep_assert_held(&zone->lru_lock); SetPageLRU(page_tail); -- 2.39.5