diff options
| author | Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> | 2010-09-30 11:54:51 +0900 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2010-10-08 09:32:46 +0200 |
| commit | 6f39ce056ab2ab2d29b2fae4aed61ed0b485972f (patch) | |
| tree | aec805e1527532e460298908317dc02c172b4a03 /include | |
| parent | d5bd910696a27e505078c19ba6b4143537570681 (diff) | |
| download | linux-stable-6f39ce056ab2ab2d29b2fae4aed61ed0b485972f.tar.gz linux-stable-6f39ce056ab2ab2d29b2fae4aed61ed0b485972f.tar.bz2 linux-stable-6f39ce056ab2ab2d29b2fae4aed61ed0b485972f.zip | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/migrate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 3c1941e40e61..085527fb8261 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -50,7 +50,7 @@ static inline int migrate_vmas(struct mm_struct *mm, static inline void migrate_page_copy(struct page *newpage, struct page *page) {} -extern int migrate_huge_page_move_mapping(struct address_space *mapping, +static inline int migrate_huge_page_move_mapping(struct address_space *mapping, struct page *newpage, struct page *page) { return -ENOSYS; |