Fix build error with !CONFIG_MIGRATION
authorNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Thu, 30 Sep 2010 02:54:51 +0000 (11:54 +0900)
committerAndi Kleen <ak@linux.intel.com>
Fri, 8 Oct 2010 07:32:46 +0000 (09:32 +0200)
commit6f39ce056ab2ab2d29b2fae4aed61ed0b485972f
treeaec805e1527532e460298908317dc02c172b4a03
parentd5bd910696a27e505078c19ba6b4143537570681
Fix build error with !CONFIG_MIGRATION

migrate_huge_page_move_mapping() is declared as "extern int ..."
in include/linux/migrate.h for !CONFIG_MIGRATION,
which causes the build error like below:

  mm/mprotect.o: In function `migrate_huge_page_move_mapping':
  mprotect.c:(.text+0x0): multiple definition of `migrate_huge_page_move_mapping'
  mm/shmem.o:shmem.c:(.text+0x0): first defined here
  mm/rmap.o: In function `migrate_huge_page_move_mapping':
  rmap.c:(.text+0x0): multiple definition of `migrate_huge_page_move_mapping'
  mm/shmem.o:shmem.c:(.text+0x0): first defined here

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
include/linux/migrate.h