Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window

Conflicts:
	fs/ocfs2/ioctl.c

2 files changed, 8 insertions, 9 deletions

diff --git a/mm/percpu.c b/mm/percpu.c
index a160db39b81..bf80e55dbed 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1215,8 +1215,10 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
         PCPU_SETUP_BUG_ON(ai->nr_groups <= 0);
 #ifdef CONFIG_SMP
         PCPU_SETUP_BUG_ON(!ai->static_size);
+        PCPU_SETUP_BUG_ON((unsigned long)__per_cpu_start & ~PAGE_MASK);
 #endif
         PCPU_SETUP_BUG_ON(!base_addr);
+        PCPU_SETUP_BUG_ON((unsigned long)base_addr & ~PAGE_MASK);
         PCPU_SETUP_BUG_ON(ai->unit_size < size_sum);
         PCPU_SETUP_BUG_ON(ai->unit_size & ~PAGE_MASK);
         PCPU_SETUP_BUG_ON(ai->unit_size < PCPU_MIN_UNIT_SIZE);
@@ -1645,8 +1647,8 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
         /* warn if maximum distance is further than 75% of vmalloc space */
         if (max_distance > (VMALLOC_END - VMALLOC_START) * 3 / 4) {
                 pr_warning("PERCPU: max_distance=0x%zx too large for vmalloc "
-                           "space 0x%lx\n",
-                           max_distance, VMALLOC_END - VMALLOC_START);
+                           "space 0x%lx\n", max_distance,
+                           (unsigned long)(VMALLOC_END - VMALLOC_START));
 #ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK
                 /* and fail if we have fallback */
                 rc = -EINVAL;
diff --git a/mm/rmap.c b/mm/rmap.c
index 8da044a1db0..522e4a93cad 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -719,7 +719,7 @@ int page_referenced(struct page *page,
                         unlock_page(page);
         }
 out:
-        if (page_test_and_clear_young(page))
+        if (page_test_and_clear_young(page_to_pfn(page)))
                 referenced++;
 
         return referenced;
@@ -785,10 +785,8 @@ int page_mkclean(struct page *page)
                 struct address_space *mapping = page_mapping(page);
                 if (mapping) {
                         ret = page_mkclean_file(mapping, page);
-                        if (page_test_dirty(page)) {
-                                page_clear_dirty(page, 1);
+                        if (page_test_and_clear_dirty(page_to_pfn(page), 1))
                                 ret = 1;
-                        }
                 }
         }
 
@@ -981,10 +979,9 @@ void page_remove_rmap(struct page *page)
          * not if it's in swapcache - there might be another pte slot
          * containing the swap entry, but page not yet written to swap.
          */
-        if ((!PageAnon(page) || PageSwapCache(page)) && page_test_dirty(page)) {
-                page_clear_dirty(page, 1);
+        if ((!PageAnon(page) || PageSwapCache(page)) &&
+            page_test_and_clear_dirty(page_to_pfn(page), 1))
                 set_page_dirty(page);
-        }
         /*
          * Hugepages are not counted in NR_ANON_PAGES nor NR_FILE_MAPPED
          * and not charged by memcg for now.