nommu: fix two build breakages
authorHugh Dickins <hugh.dickins@tiscali.co.uk>
Wed, 23 Sep 2009 16:05:53 +0000 (17:05 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 16:22:10 +0000 (09:22 -0700)
commit4266c97a3ef4604561a22212eb0eab8a3c338971
tree35b7627d6f8d1e5b236d604d02aaee8215fbb5c0
parent4fd8da8d62416d0dae05603ab5990a498d9aeb12
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>
mm/nommu.c