[BNX2]: Fix bug in bnx2_nvram_write()

[safe/jmp/linux-2.6] / mm / swap.c

diff --git a/mm/swap.c b/mm/swap.c
index 3045a0f..88895c2 100644 (file)
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -214,8 +214,8 @@ void fastcall __page_cache_release(struct page *page)
                struct zone *zone = page_zone(page);
 
                spin_lock_irqsave(&zone->lru_lock, flags);
-               if (!TestClearPageLRU(page))
-                       BUG();
+               BUG_ON(!PageLRU(page));
+               __ClearPageLRU(page);
                del_page_from_lru(zone, page);
                spin_unlock_irqrestore(&zone->lru_lock, flags);
        }
@@ -265,8 +265,8 @@ void release_pages(struct page **pages, int nr, int cold)
                                zone = pagezone;
                                spin_lock_irq(&zone->lru_lock);
                        }
-                       if (!TestClearPageLRU(page))
-                               BUG();
+                       BUG_ON(!PageLRU(page));
+                       __ClearPageLRU(page);
                        del_page_from_lru(zone, page);
                }
 
@@ -345,8 +345,8 @@ void __pagevec_lru_add(struct pagevec *pvec)
                        zone = pagezone;
                        spin_lock_irq(&zone->lru_lock);
                }
-               if (TestSetPageLRU(page))
-                       BUG();
+               BUG_ON(PageLRU(page));
+               SetPageLRU(page);
                add_page_to_inactive_list(zone, page);
        }
        if (zone)
@@ -372,10 +372,10 @@ void __pagevec_lru_add_active(struct pagevec *pvec)
                        zone = pagezone;
                        spin_lock_irq(&zone->lru_lock);
                }
-               if (TestSetPageLRU(page))
-                       BUG();
-               if (TestSetPageActive(page))
-                       BUG();
+               BUG_ON(PageLRU(page));
+               SetPageLRU(page);
+               BUG_ON(PageActive(page));
+               SetPageActive(page);
                add_page_to_active_list(zone, page);
        }
        if (zone)
@@ -512,7 +512,7 @@ long percpu_counter_sum(struct percpu_counter *fbc)
 
        spin_lock(&fbc->lock);
        ret = fbc->count;
-       for_each_cpu(cpu) {
+       for_each_possible_cpu(cpu) {
                long *pcount = per_cpu_ptr(fbc->counters, cpu);
                ret += *pcount;
        }