The patch titled
Subject: mm: stub out all of swapops.h for !CONFIG_MMU
has been added to the -mm tree. Its filename is
mm-stub-out-all-of-swapopsh-for-config_mmu.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-stub-out-all-of-swapopsh-for-config_mmu.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-stub-out-all-of-swapopsh-for-config_mmu.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Christoph Hellwig <hch@xxxxxx>
Subject: mm: stub out all of swapops.h for !CONFIG_MMU
The whole header file deals with swap entries and PTEs, none of which can
exist for nommu builds. The current nommu ports have lots of stubs to
allow the inline functions in swapops.h to compile, but as none of this
functionality is actually used there is no point in even providing it.
This way we don't have to provide the stubs for the upcoming RISC-V nommu
port, and can eventually remove it from the existing ports.
Link: http://lkml.kernel.org/r/20190703122359.18200-4-hch@xxxxxx
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Cc: Vladimir Murzin <vladimir.murzin@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/swapops.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/include/linux/swapops.h~mm-stub-out-all-of-swapopsh-for-config_mmu
+++ a/include/linux/swapops.h
@@ -6,6 +6,8 @@
#include <linux/bug.h>
#include <linux/mm_types.h>
+#ifdef CONFIG_MMU
+
/*
* swapcache pages are stored in the swapper_space radix tree. We want to
* get good packing density in that tree, so the index should be dense in
@@ -50,13 +52,11 @@ static inline pgoff_t swp_offset(swp_ent
return entry.val & SWP_OFFSET_MASK;
}
-#ifdef CONFIG_MMU
/* check whether a pte points to a swap entry */
static inline int is_swap_pte(pte_t pte)
{
return !pte_none(pte) && !pte_present(pte);
}
-#endif
/*
* Convert the arch-dependent pte representation of a swp_entry_t into an
@@ -375,4 +375,5 @@ static inline int non_swap_entry(swp_ent
}
#endif
+#endif /* CONFIG_MMU */
#endif /* _LINUX_SWAPOPS_H */
_
Patches currently in -mm which might be from hch@xxxxxx are
mm-remove-the-account_page_dirtied-export.patch
mm-fix-an-overly-long-line-in-read_cache_page.patch
mm-dont-cast-readpage-to-filler_t-for-do_read_cache_page.patch
jffs2-pass-the-correct-prototype-to-read_cache_page.patch
9p-pass-the-correct-prototype-to-read_cache_page.patch
mm-use-untagged_addr-for-get_user_pages_fast-addresses.patch
mm-simplify-gup_fast_permitted.patch
mm-lift-the-x86_32-pae-version-of-gup_get_pte-to-common-code.patch
mips-use-the-generic-get_user_pages_fast-code.patch
mips-use-the-generic-get_user_pages_fast-code-fix.patch
sh-add-the-missing-pud_page-definition.patch
sh-add-the-missing-pud_page-definition-fix.patch
sh-use-the-generic-get_user_pages_fast-code.patch
sparc64-add-the-missing-pgd_page-definition.patch
sparc64-add-the-missing-pgd_page-definition-fix.patch
sparc64-define-untagged_addr.patch
sparc64-use-the-generic-get_user_pages_fast-code.patch
mm-rename-config_have_generic_gup-to-config_have_fast_gup.patch
mm-reorder-code-blocks-in-gupc.patch
mm-consolidate-the-get_user_pages-implementations.patch
mm-validate-get_user_pages_fast-flags.patch
mm-move-the-powerpc-hugepd-code-to-mm-gupc.patch
mm-switch-gup_hugepte-to-use-try_get_compound_head.patch
mm-mark-the-page-referenced-in-gup_hugepte.patch
mm-fix-the-map_uninitialized-flag.patch
mm-provide-a-print_vma_addr-stub-for-config_mmu.patch
mm-stub-out-all-of-swapopsh-for-config_mmu.patch
