[SCSI] 3w-xxxx: remove unnecessary local_irq_save/restore for scsi sg copy API

[linux-2.6-omap-h63xx.git] / mm / migrate.c

diff --git a/mm/migrate.c b/mm/migrate.c
index 153572fb60b8debb24359e195e7a53b50f8e1c37..2a80136b23bbc16fb9d2ec2fad932b29e30dda50 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -605,7 +605,7 @@ static int move_to_new_page(struct page *newpage, struct page *page)
         * establishing additional references. We are the only one
         * holding a reference to the new page at this point.
         */
-       if (TestSetPageLocked(newpage))
+       if (!trylock_page(newpage))
                BUG();
 
        /* Prepare mapping for the new page.*/
@@ -667,7 +667,7 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private,
        BUG_ON(charge);
 
        rc = -EAGAIN;
-       if (TestSetPageLocked(page)) {
+       if (!trylock_page(page)) {
                if (!force)
                        goto move_newpage;
                lock_page(page);