aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mm.h
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-08-10 18:07:59 -0700
committerColin Cross <ccross@android.com>2011-08-10 18:07:59 -0700
commit9abd59b0df155835a970c2b9c8f93367eb793797 (patch)
treebcf0868f831d204e2b582113c53b8de3ff015eca /include/linux/mm.h
parent4e111751cfcb75f26d2725eab934b6eb91a3d115 (diff)
parent94ed5b4788a7cdbe68bc7cb8516972cbebdc8274 (diff)
downloadkernel_samsung_espresso10-9abd59b0df155835a970c2b9c8f93367eb793797.zip
kernel_samsung_espresso10-9abd59b0df155835a970c2b9c8f93367eb793797.tar.gz
kernel_samsung_espresso10-9abd59b0df155835a970c2b9c8f93367eb793797.tar.bz2
Merge commit 'v3.0.1' into android-3.0
Diffstat (limited to 'include/linux/mm.h')
-rw-r--r--include/linux/mm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index de20025..f821391 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -986,6 +986,8 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
int get_user_pages_fast(unsigned long start, int nr_pages, int write,
struct page **pages);
struct page *get_dump_page(unsigned long addr);
+extern int fixup_user_fault(struct task_struct *tsk, struct mm_struct *mm,
+ unsigned long address, unsigned int fault_flags);
extern int try_to_release_page(struct page * page, gfp_t gfp_mask);
extern void do_invalidatepage(struct page *page, unsigned long offset);