diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 17:38:20 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 17:38:20 -0400 |
| commit | c592c761a36286ab83451daa37a21c8558ea99c0 (patch) | |
| tree | 8abf57708fabf2a915320e9515b1ae2730ebf499 /mm/swap.c | |
| parent | 63236f4038f7e14762114606d95769c32cf6cac1 (diff) | |
| parent | 33499df88b711725ee473ab5478e17efd21de4b0 (diff) | |
Merge remote-tracking branch 'regulator/topic/stub' into regulator-next
Diffstat (limited to 'mm/swap.c')
| -rw-r--r-- | mm/swap.c | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -659,7 +659,7 @@ void lru_add_page_tail(struct zone* zone, | |||
| 659 | VM_BUG_ON(!PageHead(page)); | 659 | VM_BUG_ON(!PageHead(page)); |
| 660 | VM_BUG_ON(PageCompound(page_tail)); | 660 | VM_BUG_ON(PageCompound(page_tail)); |
| 661 | VM_BUG_ON(PageLRU(page_tail)); | 661 | VM_BUG_ON(PageLRU(page_tail)); |
| 662 | VM_BUG_ON(!spin_is_locked(&zone->lru_lock)); | 662 | VM_BUG_ON(NR_CPUS != 1 && !spin_is_locked(&zone->lru_lock)); |
| 663 | 663 | ||
| 664 | SetPageLRU(page_tail); | 664 | SetPageLRU(page_tail); |
| 665 | 665 | ||