Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 4266c97a3ef4604561a22212eb0eab8a3c338971

Authored by Hugh Dickins
Committed by Linus Torvalds
1 parent 4fd8da8d62

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 <michal.simek@petalogix.com>
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

... ... @@ -61,6 +61,7 @@
61 61 struct page *mem_map;
62 62 unsigned long max_mapnr;
63 63 unsigned long num_physpages;
  64 +unsigned long highest_memmap_pfn;
64 65 struct percpu_counter vm_committed_as;
65 66 int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
66 67 int sysctl_overcommit_ratio = 50; /* default is 50% */
... ... @@ -169,7 +170,7 @@
169 170 }
170 171  
171 172 int __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 174 struct page **pages, struct vm_area_struct **vmas)
174 175 {
175 176 struct vm_area_struct *vma;