From 78287d2a2d5ff453014b660ca0198d12a67d47b5 Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Wed, 8 Feb 2012 17:13:40 -0800 Subject: [PATCH] --- yaml --- r: 287338 b: refs/heads/master c: b9980cdcf2524c5fe15d8cbae9c97b3ed6385563 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/huge_memory.c | 4 ++-- trunk/mm/swap.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6a46704ac5f2..76d6238e5f72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec44fd429879f7d4f28021f1a7f9fb0b5f831aab +refs/heads/master: b9980cdcf2524c5fe15d8cbae9c97b3ed6385563 diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c index b3ffc21ce801..91d3efb25d15 100644 --- a/trunk/mm/huge_memory.c +++ b/trunk/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(!spin_is_locked(&khugepaged_mm_lock)); + VM_BUG_ON(NR_CPUS != 1 && !spin_is_locked(&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(!spin_is_locked(&khugepaged_mm_lock)); + VM_BUG_ON(NR_CPUS != 1 && !spin_is_locked(&khugepaged_mm_lock)); if (khugepaged_scan.mm_slot) mm_slot = khugepaged_scan.mm_slot; diff --git a/trunk/mm/swap.c b/trunk/mm/swap.c index b0f529b38979..fff1ff7fb9ad 100644 --- a/trunk/mm/swap.c +++ b/trunk/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(!spin_is_locked(&zone->lru_lock)); + VM_BUG_ON(NR_CPUS != 1 && !spin_is_locked(&zone->lru_lock)); SetPageLRU(page_tail);