aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/nommu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/nommu.c b/mm/nommu.c
index 1a4473faac48..8d484241d034 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -61,6 +61,7 @@ void *high_memory;
61struct page *mem_map; 61struct page *mem_map;
62unsigned long max_mapnr; 62unsigned long max_mapnr;
63unsigned long num_physpages; 63unsigned long num_physpages;
64unsigned long highest_memmap_pfn;
64struct percpu_counter vm_committed_as; 65struct percpu_counter vm_committed_as;
65int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */ 66int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
66int sysctl_overcommit_ratio = 50; /* default is 50% */ 67int sysctl_overcommit_ratio = 50; /* default is 50% */
@@ -169,7 +170,7 @@ unsigned int kobjsize(const void *objp)
169} 170}
170 171
171int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, 172int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
172 unsigned long start, int nr_pages, int foll_flags, 173 unsigned long start, int nr_pages, unsigned int foll_flags,
173 struct page **pages, struct vm_area_struct **vmas) 174 struct page **pages, struct vm_area_struct **vmas)
174{ 175{
175 struct vm_area_struct *vma; 176 struct vm_area_struct *vma;