fddi: 64 bit bug in smt_add_para()

[karo-tx-linux.git] / mm / page_isolation.c

diff --git a/mm/page_isolation.c b/mm/page_isolation.c
index fb482cf438daa1709b8f380df22303d506186664..247d1f175739247718d087aee8bba3c810daaa46 100644 (file)
--- a/mm/page_isolation.c
+++ b/mm/page_isolation.c
@@ -8,6 +8,28 @@
 #include <linux/memory.h>
 #include "internal.h"
 
+/* called while holding zone->lock */
+static void set_pageblock_isolate(struct page *page)
+{
+       if (get_pageblock_migratetype(page) == MIGRATE_ISOLATE)
+               return;
+
+       set_pageblock_migratetype(page, MIGRATE_ISOLATE);
+       page_zone(page)->nr_pageblock_isolate++;
+}
+
+/* called while holding zone->lock */
+static void restore_pageblock_isolate(struct page *page, int migratetype)
+{
+       struct zone *zone = page_zone(page);
+       if (WARN_ON(get_pageblock_migratetype(page) != MIGRATE_ISOLATE))
+               return;
+
+       BUG_ON(zone->nr_pageblock_isolate <= 0);
+       set_pageblock_migratetype(page, migratetype);
+       zone->nr_pageblock_isolate--;
+}
+
 int set_migratetype_isolate(struct page *page)
 {
        struct zone *zone;
@@ -54,7 +76,7 @@ int set_migratetype_isolate(struct page *page)
 
 out:
        if (!ret) {
-               set_pageblock_migratetype(page, MIGRATE_ISOLATE);
+               set_pageblock_isolate(page);
                move_freepages_block(zone, page, MIGRATE_ISOLATE);
        }
 
@@ -72,8 +94,8 @@ void unset_migratetype_isolate(struct page *page, unsigned migratetype)
        spin_lock_irqsave(&zone->lock, flags);
        if (get_pageblock_migratetype(page) != MIGRATE_ISOLATE)
                goto out;
-       set_pageblock_migratetype(page, migratetype);
        move_freepages_block(zone, page, migratetype);
+       restore_pageblock_isolate(page, migratetype);
 out:
        spin_unlock_irqrestore(&zone->lock, flags);
 }