From: Andi Kleen <andi@firstfloor.org>
To: linux-kernel@vger.kernel.org
Cc: Andi Kleen <ak@linux.intel.com>, aarcange@redhat.com
Subject: [PATCH 06/11] huge-memory: Use lockdep_assert_held
Date: Fri, 16 Mar 2012 12:00:59 -0700 [thread overview]
Message-ID: <1331924464-18023-7-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1331924464-18023-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Use lockdep_assert_held to check for locks instead of an opencoded
variant.
Cc: aarcange@redhat.com
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
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 91d3efb..28669c6 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2083,7 +2083,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 */
@@ -2113,7 +2113,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 fff1ff7..811e615 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -659,7 +659,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);
--
1.7.7.6
next prev parent reply other threads:[~2012-03-16 19:01 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-16 19:00 Tree sweep for spin_is_locked misuses and start warning about it Andi Kleen
2012-03-16 19:00 ` [PATCH 01/11] block: use lockdep_assert_held for queue locking Andi Kleen
2012-03-16 19:00 ` [PATCH 02/11] sgi-xp: Use lockdep_assert_held Andi Kleen
2012-03-16 19:11 ` Robin Holt
2012-03-16 19:00 ` [PATCH 03/11] ada152x: Remove broken usage of spin_is_locked Andi Kleen
2012-03-16 19:00 ` [PATCH 04/11] staging/zmem: Use lockdep_assert_held instead " Andi Kleen
2012-03-16 19:00 ` [PATCH 05/11] XFS: Fix lock ASSERT on UP Andi Kleen
2012-03-19 22:47 ` Dave Chinner
2012-03-20 2:28 ` Andi Kleen
2012-03-21 0:44 ` Dave Chinner
2012-03-16 19:00 ` Andi Kleen [this message]
2012-03-16 19:44 ` [PATCH 06/11] huge-memory: Use lockdep_assert_held Andrea Arcangeli
2012-03-16 21:18 ` Hugh Dickins
2012-03-16 19:01 ` [PATCH 07/11] futex: Use lockdep_assert_held() for lock checking Andi Kleen
2012-03-16 19:01 ` [PATCH 08/11] irda: remove spin_is_locked Andi Kleen
2012-03-16 19:01 ` [PATCH 09/11] usb: gadget: f_fs: Remove lock is held before freeing checks Andi Kleen
2012-03-16 19:01 ` [PATCH 10/11] smsc911x: Use lockdep_assert_held instead of home grown buggy construct Andi Kleen
2012-03-16 19:01 ` [PATCH 11/11] checkpatch: Check for spin_is_locked Andi Kleen
2012-03-16 19:22 ` Joe Perches
2012-03-16 20:14 ` Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331924464-18023-7-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=aarcange@redhat.com \
--cc=ak@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).