kaweth: remove ifdefed out call to dma_supported

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

diff --git a/mm/swap_state.c b/mm/swap_state.c
index d504adb7fa5f08ced98eeb2a285976c0db64a9ae..676ff2991380120275ba5d81d9660592bdc15b75 100644 (file)
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -185,13 +185,12 @@ int add_to_swap(struct page *page, struct list_head *list)
         * deadlock in the swap out path.
         */
        /*
-        * Add it to the swap cache and mark it dirty
+        * Add it to the swap cache.
         */
        err = add_to_swap_cache(page, entry,
                        __GFP_HIGH|__GFP_NOMEMALLOC|__GFP_NOWARN);
 
-       if (!err) {     /* Success */
-               SetPageDirty(page);
+       if (!err) {
                return 1;
        } else {        /* -ENOMEM radix-tree allocation failure */
                /*
@@ -353,7 +352,7 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
                }
 
                /* May fail (-ENOMEM) if radix-tree node allocation failed. */
-               __set_page_locked(new_page);
+               __SetPageLocked(new_page);
                SetPageSwapBacked(new_page);
                err = __add_to_swap_cache(new_page, entry);
                if (likely(!err)) {
@@ -367,7 +366,7 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
                }
                radix_tree_preload_end();
                ClearPageSwapBacked(new_page);
-               __clear_page_locked(new_page);
+               __ClearPageLocked(new_page);
                /*
                 * add_to_swap_cache() doesn't return -EEXIST, so we can safely
                 * clear SWAP_HAS_CACHE flag.