From: Hugh Dickins Date: Wed, 23 Sep 2009 16:05:53 +0000 (+0100) Subject: nommu: fix two build breakages X-Git-Tag: v2.6.32-rc1~176 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4266c97a3ef4604561a22212eb0eab8a3c338971;p=platform%2Fkernel%2Flinux-stable.git nommu: fix two build breakages My 58fa879e1e640a1856f736b418984ebeccee1c95 "mm: FOLL flags for GUP flags" broke CONFIG_NOMMU build by forgetting to update nommu.c foll_flags type: mm/nommu.c:171: error: conflicting types for `__get_user_pages' mm/internal.h:254: error: previous declaration of `__get_user_pages' was here make[1]: *** [mm/nommu.o] Error 1 My 03f6462a3ae78f36eb1f0ee8b4d5ae2f7859c1d5 "mm: move highest_memmap_pfn" broke CONFIG_NOMMU build by forgetting to add a nommu.c highest_memmap_pfn: mm/built-in.o: In function `memmap_init_zone': (.meminit.text+0x326): undefined reference to `highest_memmap_pfn' mm/built-in.o: In function `memmap_init_zone': (.meminit.text+0x32d): undefined reference to `highest_memmap_pfn' Fix both breakages, and give myself 30 lashes (ouch!) Reported-by: Michal Simek Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds --- diff --git a/mm/nommu.c b/mm/nommu.c index 1a4473fa..8d48424 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -61,6 +61,7 @@ void *high_memory; struct page *mem_map; unsigned long max_mapnr; unsigned long num_physpages; +unsigned long highest_memmap_pfn; struct percpu_counter vm_committed_as; int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */ int sysctl_overcommit_ratio = 50; /* default is 50% */ @@ -169,7 +170,7 @@ unsigned int kobjsize(const void *objp) } int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, - unsigned long start, int nr_pages, int foll_flags, + unsigned long start, int nr_pages, unsigned int foll_flags, struct page **pages, struct vm_area_struct **vmas) { struct vm_area_struct *vma;