From 74d84fe61f3590d2a0f5926272cd62e940b3da69 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 8 Dec 2020 08:03:33 -0600 Subject: Revert mm patch which breaks build Signed-off-by: Justin M. Forbes --- kernel.spec | 2 + ...c-for-function-__add_to_page_cache_locked.patch | 90 ++++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch diff --git a/kernel.spec b/kernel.spec index 5050f7250..e25f44f46 100755 --- a/kernel.spec +++ b/kernel.spec @@ -740,6 +740,7 @@ Source4000: README.rst %if !%{nopatches} Patch1: patch-%{rpmversion}-redhat.patch +Patch2: revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch %endif # empty final patch to facilitate testing of kernel patches @@ -1243,6 +1244,7 @@ cp -a %{SOURCE1} . %if !%{nopatches} ApplyOptionalPatch patch-%{rpmversion}-redhat.patch +ApplyOptionalPatch revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch %endif ApplyOptionalPatch linux-kernel-test.patch diff --git a/revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch b/revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch new file mode 100644 index 000000000..bde2539a8 --- /dev/null +++ b/revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch @@ -0,0 +1,90 @@ +From: akpm@linux-foundation.org +To: mm-commits@vger.kernel.org, mkubecek@suse.cz, jrdr.linux@gmail.com, + josef@toxicpanda.com, jmforbes@linuxtx.org, daniel@iogearbox.net, + ast@kernel.org, alex.shi@linux.alibaba.com, akpm@linux-foundation.org +Subject: + + revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch + added to -mm tree +Message-ID: <20201208034157.9KFja%akpm@linux-foundation.org> +User-Agent: s-nail v14.9.10 + + +The patch titled + Subject: revert "mm/filemap: add static for function __add_to_page_cache_locked" +has been added to the -mm tree. Its filename is + revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch + +This patch should soon appear at + https://ozlabs.org/~akpm/mmots/broken-out/revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch +and later at + https://ozlabs.org/~akpm/mmotm/broken-out/revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.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: Andrew Morton +Subject: revert "mm/filemap: add static for function __add_to_page_cache_locked" + +Revert 3351b16af494 ("mm/filemap: add static for function +__add_to_page_cache_locked") due to build issues with +CONFIG_DEBUG_INFO_BTF=y. + +Link: https://lkml.kernel.org/r/CAADnVQJ6tmzBXvtroBuEH6QA0H+q7yaSKxrVvVxhqr3KBZdEXg@mail.gmail.com +Cc: Michal Kubecek +Cc: Justin Forbes +Cc: Alex Shi +Cc: Souptick Joarder +Cc: Alexei Starovoitov +Cc: Daniel Borkmann +Cc: Josef Bacik +Signed-off-by: Andrew Morton +--- + + mm/filemap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/mm/filemap.c~revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked ++++ a/mm/filemap.c +@@ -827,7 +827,7 @@ int replace_page_cache_page(struct page + } + EXPORT_SYMBOL_GPL(replace_page_cache_page); + +-static noinline int __add_to_page_cache_locked(struct page *page, ++noinline int __add_to_page_cache_locked(struct page *page, + struct address_space *mapping, + pgoff_t offset, gfp_t gfp, + void **shadowp) +_ + +Patches currently in -mm which might be from akpm@linux-foundation.org are + +revert-mm-filemap-add-static-for-function-__add_to_page_cache_locked.patch +kthread_worker-document-cpu-hotplug-handling-fix.patch +mm.patch +mm-remove-the-unuseful-else-after-a-return-checkpatch-fixes.patch +mm-prevent-gup_fast-from-racing-with-cow-during-fork-checkpatch-fixes.patch +mm-swap_state-skip-meaningless-swap-cache-readahead-when-ra_infowin-==-0-fix.patch +mm-vmallocc-__vmalloc_area_node-avoid-32-bit-overflow.patch +mm-cma-improve-pr_debug-log-in-cma_release-fix.patch +mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch +lib-cmdline_kunit-add-a-new-test-suite-for-cmdline-api-fix.patch +ilog2-improve-ilog2-for-constant-arguments-checkpatch-fixes.patch +lib-test_bitmapc-add-for_each_set_clump-test-cases-checkpatch-fixes.patch +checkpatch-fix-typo_spelling-check-for-words-with-apostrophe-fix.patch +resource-fix-kernel-doc-markups-checkpatch-fixes.patch +linux-next-rejects.patch +kmap-stupid-hacks-to-make-it-compile.patch +init-kconfig-dont-assume-scripts-lld-versionsh-is-executable.patch +set_memory-allow-set_direct_map__noflush-for-multiple-pages-fix.patch +arch-mm-wire-up-memfd_secret-system-call-were-relevant-fix.patch +kernel-forkc-export-kernel_thread-to-modules.patch + -- cgit