The patch titled
Subject: mm/damon/vaddr: include 'highmem.h' to fix a build failure
has been removed from the -mm tree. Its filename was
mm-damon-vaddr-separate-commonly-usable-functions-fix.patch
This patch was dropped because it was folded into mm-damon-vaddr-separate-commonly-usable-functions.patch
------------------------------------------------------
From: SeongJae Park <sj@xxxxxxxxxx>
Subject: mm/damon/vaddr: include 'highmem.h' to fix a build failure
Commit 0ff28922686c ("mm/damon/vaddr: separate commonly usable functions")
in -mm tree[1] moves include of 'highmem.h' from 'vaddr.c' to
'prmtv-common.c', though the code for the header is still in 'vaddr.c'.
As a result, build with 'CONFIG_HIGHPTE' fails as below:
In file included from ../include/linux/mm.h:33:0,
from ../include/linux/kallsyms.h:13,
from ../include/linux/bpf.h:20,
from ../include/linux/bpf-cgroup.h:5,
from ../include/linux/cgroup-defs.h:22,
from ../include/linux/cgroup.h:28,
from ../include/linux/hugetlb.h:9,
from ../mm/damon/vaddr.c:11:
../mm/damon/vaddr.c: In function `damon_mkold_pmd_entry':
../include/linux/pgtable.h:97:12: error: implicit declaration of function `kmap_atomic'; did you mean `mcopy_atomic'? [-Werror=implicit-function-declaration]
((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
^
../include/linux/mm.h:2376:17: note: in expansion of macro `pte_offset_map'
pte_t *__pte = pte_offset_map(pmd, address); \
^~~~~~~~~~~~~~
../mm/damon/vaddr.c:387:8: note: in expansion of macro `pte_offset_map_lock'
pte = pte_offset_map_lock(walk->mm, pmd, addr, &ptl);
^~~~~~~~~~~~~~~~~~~
../include/linux/pgtable.h:99:24: error: implicit declaration of function `kunmap_atomic'; did you mean `in_atomic'? [-Werror=implicit-function-declaration]
#define pte_unmap(pte) kunmap_atomic((pte))
^
../include/linux/mm.h:2384:2: note: in expansion of macro `pte_unmap'
pte_unmap(pte); \
^~~~~~~~~
../mm/damon/vaddr.c:392:2: note: in expansion of macro `pte_unmap_unlock'
pte_unmap_unlock(pte, ptl);
^~~~~~~~~~~~~~~~
This commit fixes the issue by moving the include back to 'vaddr.c'.
[1] https://github.com/hnaz/linux-mm/commit/0ff28922686c
Link: https://lkml.kernel.org/r/20211014110848.5204-1-sj@xxxxxxxxxx
Signed-off-by: SeongJae Park <sj@xxxxxxxxxx>
Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Tested-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Cc: Mark Brown <broonie@xxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/damon/prmtv-common.c | 1 -
mm/damon/vaddr.c | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
--- a/mm/damon/prmtv-common.c~mm-damon-vaddr-separate-commonly-usable-functions-fix
+++ a/mm/damon/prmtv-common.c
@@ -5,7 +5,6 @@
* Author: SeongJae Park <sj@xxxxxxxxxx>
*/
-#include <linux/highmem.h>
#include <linux/mmu_notifier.h>
#include <linux/page_idle.h>
#include <linux/pagemap.h>
--- a/mm/damon/vaddr.c~mm-damon-vaddr-separate-commonly-usable-functions-fix
+++ a/mm/damon/vaddr.c
@@ -8,6 +8,7 @@
#define pr_fmt(fmt) "damon-va: " fmt
#include <asm-generic/mman-common.h>
+#include <linux/highmem.h>
#include <linux/hugetlb.h>
#include <linux/mmu_notifier.h>
#include <linux/page_idle.h>
_
Patches currently in -mm which might be from sj@xxxxxxxxxx are
maintainers-update-seongjaes-email-address.patch
mm-damon-core-print-kdamond-start-log-in-debug-mode-only.patch
mm-damon-core-account-age-of-target-regions.patch
mm-damon-core-implement-damon-based-operation-schemes-damos.patch
mm-damon-vaddr-support-damon-based-operation-schemes.patch
mm-damon-dbgfs-support-damon-based-operation-schemes.patch
mm-damon-schemes-implement-statistics-feature.patch
selftests-damon-add-schemes-debugfs-tests.patch
docs-admin-guide-mm-damon-document-damon-based-operation-schemes.patch
mm-damon-dbgfs-allow-users-to-set-initial-monitoring-target-regions.patch
mm-damon-dbgfs-test-add-a-unit-test-case-for-init_regions.patch
docs-admin-guide-mm-damon-document-init_regions-feature.patch
mm-damon-vaddr-separate-commonly-usable-functions.patch
mm-damon-implement-primitives-for-physical-address-space-monitoring.patch
mm-damon-dbgfs-support-physical-memory-monitoring.patch
docs-damon-document-physical-memory-monitoring-support.patch
mm-damon-paddr-support-the-pageout-scheme.patch
mm-damon-paddr-support-the-pageout-scheme-fix.patch
mm-damon-schemes-implement-size-quota-for-schemes-application-speed-control.patch
mm-damon-schemes-skip-already-charged-targets-and-regions.patch
mm-damon-schemes-implement-time-quota.patch
mm-damon-dbgfs-support-quotas-of-schemes.patch
mm-damon-selftests-support-schemes-quotas.patch
mm-damon-schemes-prioritize-regions-within-the-quotas.patch
mm-damon-vaddrpaddr-support-pageout-prioritization.patch
mm-damon-dbgfs-support-prioritization-weights.patch
tools-selftests-damon-update-for-regions-prioritization-of-schemes.patch
mm-damon-schemes-activate-schemes-based-on-a-watermarks-mechanism.patch
mm-damon-dbgfs-support-watermarks.patch
selftests-damon-support-watermarks.patch
mm-damon-introduce-damon-based-reclamation-damon_reclaim.patch
documentation-admin-guide-mm-damon-add-a-document-for-damon_reclaim.patch
docs-admin-guide-mm-damon-start-fix-wrong-example-commands.patch
docs-admin-guide-mm-damon-start-fix-a-wrong-link.patch
docs-admin-guide-mm-damon-start-simplify-the-content.patch
docs-admin-guide-mm-pagemap-wordsmith-page-flags-descriptions.patch
