CONFIG_SWAP=n broken in latest tree
Subsystems (2)
Commit 42da9cbd ("mm: mincore anon") breaks CONFIG_SWAP=n builds with:
mm/built-in.o: In function `sys_mincore':
(.text+0xe2c4): undefined reference to `swapper_space'
because swapper_space is used unconditionally in mm/mincore.c but only defined in swap_state.c, which isn't built if CONFIG_SWAP=n.
I'd include a patch but I'm not sure what the right fix is really -- the naively obvious thing to do would be to add an #ifdef to mincore.c like the below, but I don't know this area at all well enough to be confident in the fix.
mm/mincore.c +4 -2
@@ -109,8 +109,9 @@ static long do_mincore(unsigned long addr, unsigned char *vec, unsigned long pag }else if (pte_file (pte)) { pgoff =pte_to_pgoff (pte); present =mincore_page (vma->vm_file->f_mapping, pgoff); - - }else {/* pte is a swap entry */ + } +#ifdef CONFIG_SWAP + else { /* pte is a swap entry */swp_entry_t entry =pte_to_swp_entry (pte);if (is_migration_entry (entry)) {/* migration entries are always uptodate */
@@ -120,6 +121,7 @@ static long do_mincore(unsigned long addr, unsigned char *vec, unsigned long pag present = mincore_page(&swapper_space, pgoff); } } +#endif /* CONFIG_SWAP */ }pte_unmap_unlock (ptep-1 , ptl);
Quoted 30 lines · On Wed, 14 Feb 2007 14:41:05 -0800 Roland Dreier wrote:
Commit
42da9cbd("mm: mincore anon") breaksCONFIG_SWAP=nbuilds with:
mm/built-in.o: In function `sys_mincore':
(.text+0xe2c4): undefined reference to `swapper_space'because
swapper_spaceis used unconditionally inmm/mincore.cbut only defined inswap_state.c, which isn't built ifCONFIG_SWAP=n.I'd include a patch but I'm not sure what the right fix is really -- the naively obvious thing to do would be to add an #ifdef to
mincore.clike the below, but I don't know this area at all well enough to be confident in the fix.mm/mincore.c +3
-2@@ -109,8 +109,9 @@ static long do_mincore(unsigned long addr, unsigned char *vec, unsigned long pag }else if (pte_file (pte)) { pgoff =pte_to_pgoff (pte); present =mincore_page (vma->vm_file->f_mapping, pgoff); - - }else {/* pte is a swap entry */ + } +#ifdef CONFIG_SWAP + else { /* pte is a swap entry */swp_entry_t entry =pte_to_swp_entry (pte);if (is_migration_entry (entry)) {/* migration entries are always uptodate */
mm/mincore.c static long do_mincore(unsigned long addr, unsigned char *vec, unsigned long pag
Quoted 8 lines
mm/mincore.c +1
-1@@ -120,6 +121,7 @@ static long do_mincore(unsigned long addr, unsigned char *vec, unsigned long pag present = mincore_page(&swapper_space, pgoff); } } +#endif /* CONFIG_SWAP */ }pte_unmap_unlock (ptep-1 , ptl); -
We've beat this almost to death... just need some patch merged.
or reverted.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Quoted 1 line
We've beat this almost to death... just need some patch merged.
Sorry, missed the discussion I guess...