Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[platform/kernel/linux-rpi.git] / mm / internal.h

diff --git a/mm/internal.h b/mm/internal.h
index 537ac99..44d6889 100644 (file)
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -36,7 +36,7 @@
 /* Do not use these with a slab allocator */
 #define GFP_SLAB_BUG_MASK (__GFP_DMA32|__GFP_HIGHMEM|~__GFP_BITS_MASK)
 
-int do_swap_page(struct fault_env *fe, pte_t orig_pte);
+int do_swap_page(struct vm_fault *vmf);
 
 void free_pgtables(struct mmu_gather *tlb, struct vm_area_struct *start_vma,
                unsigned long floor, unsigned long ceiling);