Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm

[~andy/linux] / mm / internal.h

diff --git a/mm/internal.h b/mm/internal.h
index 4c98630f0f7755b5c56003ab63724a07f3b2fa3f..3438dd43a062203a86a6f4b3e65e531ca8ae9384 100644 (file)
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -39,15 +39,6 @@ static inline void __put_page(struct page *page)
 
 extern unsigned long highest_memmap_pfn;
 
-#ifdef CONFIG_SMP
-extern int putback_active_lru_page(struct zone *zone, struct page *page);
-#else
-static inline int putback_active_lru_page(struct zone *zone, struct page *page)
-{
-       return 0;
-}
-#endif
-
 /*
  * in mm/vmscan.c:
  */
@@ -254,11 +245,6 @@ static inline void mminit_validate_memmodel_limits(unsigned long *start_pfn,
 }
 #endif /* CONFIG_SPARSEMEM */
 
-int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
-                    unsigned long start, int len, unsigned int foll_flags,
-                    struct page **pages, struct vm_area_struct **vmas,
-                    int *nonblocking);
-
 #define ZONE_RECLAIM_NOSCAN    -2
 #define ZONE_RECLAIM_FULL      -1
 #define ZONE_RECLAIM_SOME      0