Merge branches 'acpi-ec' and 'acpi-x86'

[linux-2.6-microblaze.git] / mm / page_isolation.c

diff --git a/mm/page_isolation.c b/mm/page_isolation.c
index 04ee166..a9fd7c7 100644 (file)
--- a/mm/page_isolation.c
+++ b/mm/page_isolation.c
@@ -17,10 +17,9 @@
 
 static int set_migratetype_isolate(struct page *page, int migratetype, int isol_flags)
 {
+       struct page *unmovable = NULL;
        struct zone *zone;
-       unsigned long flags, pfn;
-       struct memory_isolate_notify arg;
-       int notifier_ret;
+       unsigned long flags;
        int ret = -EBUSY;
 
        zone = page_zone(page);
@@ -35,41 +34,12 @@ static int set_migratetype_isolate(struct page *page, int migratetype, int isol_
        if (is_migrate_isolate_page(page))
                goto out;
 
-       pfn = page_to_pfn(page);
-       arg.start_pfn = pfn;
-       arg.nr_pages = pageblock_nr_pages;
-       arg.pages_found = 0;
-
-       /*
-        * It may be possible to isolate a pageblock even if the
-        * migratetype is not MIGRATE_MOVABLE. The memory isolation
-        * notifier chain is used by balloon drivers to return the
-        * number of pages in a range that are held by the balloon
-        * driver to shrink memory. If all the pages are accounted for
-        * by balloons, are free, or on the LRU, isolation can continue.
-        * Later, for example, when memory hotplug notifier runs, these
-        * pages reported as "can be isolated" should be isolated(freed)
-        * by the balloon driver through the memory notifier chain.
-        */
-       notifier_ret = memory_isolate_notify(MEM_ISOLATE_COUNT, &arg);
-       notifier_ret = notifier_to_errno(notifier_ret);
-       if (notifier_ret)
-               goto out;
        /*
         * FIXME: Now, memory hotplug doesn't call shrink_slab() by itself.
         * We just check MOVABLE pages.
         */
-       if (!has_unmovable_pages(zone, page, arg.pages_found, migratetype,
-                                isol_flags))
-               ret = 0;
-
-       /*
-        * immobile means "not-on-lru" pages. If immobile is larger than
-        * removable-by-driver pages reported by notifier, we'll fail.
-        */
-
-out:
-       if (!ret) {
+       unmovable = has_unmovable_pages(zone, page, migratetype, isol_flags);
+       if (!unmovable) {
                unsigned long nr_pages;
                int mt = get_pageblock_migratetype(page);
 
@@ -79,11 +49,24 @@ out:
                                                                        NULL);
 
                __mod_zone_freepage_state(zone, -nr_pages, mt);
+               ret = 0;
        }
 
+out:
        spin_unlock_irqrestore(&zone->lock, flags);
-       if (!ret)
+       if (!ret) {
                drain_all_pages(zone);
+       } else {
+               WARN_ON_ONCE(zone_idx(zone) == ZONE_MOVABLE);
+
+               if ((isol_flags & REPORT_FAILURE) && unmovable)
+                       /*
+                        * printk() with zone->lock held will likely trigger a
+                        * lockdep splat, so defer it here.
+                        */
+                       dump_page(unmovable, "unmovable page");
+       }
+
        return ret;
 }