lkml.org 
[lkml]   [2012]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/11] huge-memory: Use lockdep_assert_held
    Date
    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


    \
     
     \ /
      Last update: 2012-03-16 20:05    [W:0.021 / U:88.184 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site