From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: "Vishal Moola (Oracle)" <vishal.moola@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the mm tree
Date: Wed, 25 Jan 2023 14:05:00 +1100 [thread overview]
Message-ID: <20230125140500.4509de80@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 5254 bytes --]
Hi all,
After merging the mm tree, today's linux-next build (x86_64 allnoconfig)
failed like this:
In file included from arch/x86/include/asm/page.h:85,
from arch/x86/include/asm/thread_info.h:12,
from include/linux/thread_info.h:60,
from arch/x86/include/asm/preempt.h:9,
from include/linux/preempt.h:78,
from include/linux/spinlock.h:56,
from include/linux/mmzone.h:8,
from include/linux/gfp.h:7,
from include/linux/slab.h:15,
from include/linux/crypto.h:20,
from arch/x86/kernel/asm-offsets.c:9:
include/linux/mm.h: In function 'folio_estimated_mapcount':
include/asm-generic/memory_model.h:35:21: error: implicit declaration of function 'page_to_section'; did you mean 'present_section'? [-Werror=implicit-function-declaration]
35 | int __sec = page_to_section(__pg); \
| ^~~~~~~~~~~~~~~
include/asm-generic/memory_model.h:40:32: note: in definition of macro '__pfn_to_page'
40 | ({ unsigned long __pfn = (pfn); \
| ^~~
include/asm-generic/memory_model.h:52:21: note: in expansion of macro '__page_to_pfn'
52 | #define page_to_pfn __page_to_pfn
| ^~~~~~~~~~~~~
include/linux/mm.h:216:38: note: in expansion of macro 'page_to_pfn'
216 | #define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n))
| ^~~~~~~~~~~
include/linux/page-flags.h:286:33: note: in expansion of macro 'nth_page'
286 | #define folio_page(folio, n) nth_page(&(folio)->page, n)
| ^~~~~~~~
include/linux/mm.h:918:30: note: in expansion of macro 'folio_page'
918 | return page_mapcount(folio_page(folio, 0));
| ^~~~~~~~~~
In file included from include/linux/memcontrol.h:20,
from include/linux/swap.h:9,
from include/linux/suspend.h:5,
from arch/x86/kernel/asm-offsets.c:14:
include/linux/mm.h: At top level:
include/linux/mm.h:1626:29: error: conflicting types for 'page_to_section'; have 'long unsigned int(const struct page *)'
1626 | static inline unsigned long page_to_section(const struct page *page)
| ^~~~~~~~~~~~~~~
include/asm-generic/memory_model.h:35:21: note: previous implicit declaration of 'page_to_section' with type 'int()'
35 | int __sec = page_to_section(__pg); \
| ^~~~~~~~~~~~~~~
include/asm-generic/memory_model.h:40:32: note: in definition of macro '__pfn_to_page'
40 | ({ unsigned long __pfn = (pfn); \
| ^~~
include/asm-generic/memory_model.h:52:21: note: in expansion of macro '__page_to_pfn'
52 | #define page_to_pfn __page_to_pfn
| ^~~~~~~~~~~~~
include/linux/mm.h:216:38: note: in expansion of macro 'page_to_pfn'
216 | #define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n))
| ^~~~~~~~~~~
include/linux/page-flags.h:286:33: note: in expansion of macro 'nth_page'
286 | #define folio_page(folio, n) nth_page(&(folio)->page, n)
| ^~~~~~~~
include/linux/mm.h:918:30: note: in expansion of macro 'folio_page'
918 | return page_mapcount(folio_page(folio, 0));
| ^~~~~~~~~~
cc1: some warnings being treated as errors
Caused by commit
59c975083d37 ("mm: add folio_estimated_mapcount()")
I applied the following fix patch (hack):
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 25 Jan 2023 13:42:20 +1100
Subject: [PATCH] fix up for "mm: add folio_estimated_mapcount()"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
include/linux/mm.h | 5 -----
mm/mempolicy.c | 7 +++++++
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index b7d6e290df99..78c766859fb7 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -913,11 +913,6 @@ static inline int page_mapcount(struct page *page)
return mapcount;
}
-static inline int folio_estimated_mapcount(struct folio *folio)
-{
- return page_mapcount(folio_page(folio, 0));
-}
-
int folio_total_mapcount(struct folio *folio);
/**
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 03220ba94074..c81db10612eb 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -558,6 +558,13 @@ static int queue_folios_pte_range(pmd_t *pmd, unsigned long addr,
return addr != end ? -EIO : 0;
}
+#if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_MIGRATION)
+static inline int folio_estimated_mapcount(struct folio *folio)
+{
+ return page_mapcount(folio_page(folio, 0));
+}
+#endif
+
static int queue_folios_hugetlb(pte_t *pte, unsigned long hmask,
unsigned long addr, unsigned long end,
struct mm_walk *walk)
--
2.35.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-01-25 3:05 UTC|newest]
Thread overview: 189+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-25 3:05 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-12 0:36 linux-next: build failure after merge of the mm tree Stephen Rothwell
2025-03-12 2:14 ` Wei Yang
2025-03-12 2:30 ` Stephen Rothwell
2025-03-12 13:10 ` Wei Yang
2025-03-12 15:24 ` Andrew Morton
2025-03-11 10:26 Stephen Rothwell
2025-02-26 5:12 Stephen Rothwell
2025-02-19 4:52 Stephen Rothwell
2025-02-16 23:14 Stephen Rothwell
2025-02-16 23:22 ` Suren Baghdasaryan
2025-02-17 5:45 ` Suren Baghdasaryan
2025-01-09 4:59 Stephen Rothwell
2025-01-09 5:01 ` Stephen Rothwell
2025-01-09 5:32 ` Andrew Morton
2025-01-09 11:00 ` Alistair Popple
2025-01-08 23:06 Stephen Rothwell
2025-01-09 4:24 ` Alistair Popple
2024-12-19 23:39 Stephen Rothwell
2024-12-09 6:08 Stephen Rothwell
2024-12-10 2:25 ` Andrew Morton
2024-12-10 2:59 ` Suren Baghdasaryan
2024-12-10 3:37 ` SeongJae Park
2024-12-10 5:00 ` Stephen Rothwell
2024-12-10 5:30 ` Andrew Morton
2024-12-09 4:28 Stephen Rothwell
2024-12-09 11:14 ` Lorenzo Stoakes
2024-12-09 0:01 Stephen Rothwell
2024-10-27 23:36 Stephen Rothwell
2024-10-28 1:00 ` Andrew Morton
2024-08-14 23:57 Stephen Rothwell
2024-08-15 0:06 ` Stephen Rothwell
2024-08-15 22:57 ` Andrew Morton
2024-08-15 0:08 ` Andrew Morton
2024-08-15 0:25 ` Stephen Rothwell
2024-08-14 23:38 Stephen Rothwell
2024-08-15 7:42 ` Uros Bizjak
2024-08-15 12:28 ` Uros Bizjak
2024-08-16 1:29 ` Stephen Rothwell
2024-08-16 6:45 ` Uros Bizjak
2024-08-11 23:30 Stephen Rothwell
2024-08-12 22:14 ` Kaiyang Zhao
2024-07-23 22:49 Stephen Rothwell
2024-07-24 5:31 ` Lorenzo Stoakes
2024-07-24 5:57 ` Andrew Morton
2024-07-09 23:32 Stephen Rothwell
2024-07-09 8:40 Stephen Rothwell
2024-07-09 8:45 ` Stephen Rothwell
2024-06-19 11:31 Mark Brown
2024-04-30 0:38 Stephen Rothwell
2024-04-30 2:23 ` Lance Yang
2024-04-23 0:22 Stephen Rothwell
2024-04-12 6:39 Stephen Rothwell
2024-04-11 23:14 Stephen Rothwell
2024-04-07 23:15 Stephen Rothwell
2024-04-08 1:44 ` Barry Song
2024-04-05 2:55 Stephen Rothwell
2024-03-28 4:34 Stephen Rothwell
2024-03-05 4:26 Stephen Rothwell
2024-03-05 6:39 ` Qi Zheng
2024-02-14 3:57 Stephen Rothwell
2024-02-14 15:19 ` Andrew Morton
2024-02-15 3:47 ` Stephen Rothwell
2024-02-07 6:17 Stephen Rothwell
2024-02-01 2:57 Stephen Rothwell
2024-02-01 8:35 ` Marco Elver
2024-01-25 3:29 Stephen Rothwell
2024-01-25 14:29 ` Baoquan He
2024-01-25 18:03 ` Stephen Rothwell
2024-01-24 23:23 Stephen Rothwell
2024-01-24 23:52 ` Suren Baghdasaryan
2024-01-25 2:40 ` Baoquan He
2024-01-23 23:05 Stephen Rothwell
2024-01-23 23:14 ` Suren Baghdasaryan
2023-12-21 7:38 Stephen Rothwell
2023-12-21 7:45 ` Changbin Du
2023-11-28 21:45 Stephen Rothwell
2023-11-28 22:45 ` Andrew Morton
2023-11-29 8:17 ` Dmitry Rokosov
2023-11-30 22:12 ` Stephen Rothwell
2023-11-27 3:44 Stephen Rothwell
2023-12-22 0:16 ` Stephen Rothwell
2023-12-22 6:26 ` Andrew Morton
2023-11-27 2:28 Stephen Rothwell
2023-11-27 3:48 ` Stephen Rothwell
2023-11-30 22:04 ` Stephen Rothwell
2023-11-30 22:32 ` Andrew Morton
2023-11-30 22:39 ` Michael Ellerman
2023-11-30 22:52 ` Andrew Morton
2023-12-01 3:12 ` Michael Ellerman
2023-12-07 12:38 ` Michael Ellerman
2023-10-03 22:50 Stephen Rothwell
2023-09-27 23:22 Stephen Rothwell
2023-09-28 6:47 ` Arnd Bergmann
2023-09-25 23:18 Stephen Rothwell
2023-08-22 22:52 Stephen Rothwell
2023-08-21 23:55 Stephen Rothwell
2023-08-22 1:11 ` Matthew Wilcox
2023-08-22 1:22 ` Stephen Rothwell
2023-08-22 1:34 ` Matthew Wilcox
2023-08-22 4:00 ` Darrick J. Wong
2023-08-22 20:20 ` Matthew Wilcox
2023-08-22 7:12 ` Michael Ellerman
2023-08-08 4:40 Stephen Rothwell
2023-08-08 15:20 ` Eric DeVolder
2023-08-11 17:16 ` Eric DeVolder
2023-07-26 5:14 Stephen Rothwell
2023-07-26 13:22 ` Kuan-Ying Lee (李冠穎)
2023-07-26 4:53 Stephen Rothwell
2023-07-26 5:22 ` Aneesh Kumar K.V
2023-07-26 6:51 ` Stephen Rothwell
2023-07-19 4:32 Stephen Rothwell
2023-07-19 5:55 ` Alistair Popple
2023-07-18 0:02 Stephen Rothwell
2023-07-18 13:43 ` Andy Shevchenko
2023-07-18 17:34 ` Andrew Morton
2023-07-18 21:07 ` Andy Shevchenko
2023-07-17 23:40 Stephen Rothwell
2023-07-04 2:23 Stephen Rothwell
2023-07-04 2:32 ` Linus Torvalds
2023-07-04 5:51 ` Suren Baghdasaryan
2023-06-13 6:21 Stephen Rothwell
2023-06-13 15:58 ` Catalin Marinas
2023-05-19 2:43 Stephen Rothwell
2023-05-19 8:19 ` Arnd Bergmann
2023-05-17 23:59 Stephen Rothwell
2023-03-06 2:54 Stephen Rothwell
2023-03-06 3:13 ` Andrew Morton
2023-03-06 0:52 Stephen Rothwell
2023-03-06 21:58 ` Stephen Rothwell
2023-02-07 4:37 Stephen Rothwell
2023-02-07 12:17 ` Jason Gunthorpe
2023-02-07 14:25 ` David Howells
2023-02-08 2:41 ` Stephen Rothwell
2023-01-30 5:14 Stephen Rothwell
2023-01-30 8:09 ` Christian Brauner
2023-02-26 22:18 ` Stephen Rothwell
2023-02-27 10:36 ` Christian Brauner
2023-01-27 6:36 Stephen Rothwell
2023-01-27 6:16 Stephen Rothwell
2023-01-27 5:59 Stephen Rothwell
2023-01-27 13:11 ` Jan Kara
2023-01-31 21:47 ` Stephen Rothwell
2023-02-24 4:40 ` Stephen Rothwell
2023-02-24 6:01 ` Linus Torvalds
2023-02-24 20:36 ` Stephen Rothwell
2022-12-16 1:26 Stephen Rothwell
2022-12-16 3:04 ` Andrew Morton
2022-12-16 0:21 Stephen Rothwell
2022-12-16 0:35 ` Andrew Morton
2022-12-16 1:03 ` Masami Hiramatsu
2022-11-22 6:53 Stephen Rothwell
2022-11-22 10:31 ` David Hildenbrand
2022-11-03 5:02 Stephen Rothwell
2022-11-02 3:55 Stephen Rothwell
2022-11-02 21:26 ` Andrew Morton
2022-10-18 1:24 Stephen Rothwell
2022-09-23 8:12 Stephen Rothwell
2022-09-23 8:15 ` David Hildenbrand
2022-09-23 7:55 Stephen Rothwell
2022-09-23 9:50 ` Michael Walle
2022-09-23 11:01 ` Naoya Horiguchi
2022-09-15 7:07 Stephen Rothwell
2022-09-15 16:37 ` Mike Kravetz
2022-09-15 20:06 ` Andrew Morton
2022-09-06 11:03 Stephen Rothwell
2022-09-06 12:05 ` Rob Clark
2022-09-06 18:05 ` Stephen Rothwell
2022-08-26 7:10 Stephen Rothwell
2022-08-26 7:32 ` Michal Hocko
2022-07-08 9:44 Stephen Rothwell
2022-07-08 15:17 ` Darrick J. Wong
2022-07-10 22:28 ` Stephen Rothwell
2022-05-12 9:38 Stephen Rothwell
2022-05-12 10:13 ` Baolin Wang
2022-05-12 11:07 ` Catalin Marinas
2022-05-12 11:13 ` Baolin Wang
2022-05-12 13:28 ` Catalin Marinas
2022-05-12 19:10 ` Andrew Morton
2022-05-13 7:18 ` Stephen Rothwell
2022-05-11 8:15 Stephen Rothwell
2022-05-11 8:27 ` Baolin Wang
2022-05-11 8:42 ` Baolin Wang
2022-05-11 23:28 ` Stephen Rothwell
2022-05-10 11:25 Stephen Rothwell
2022-05-05 21:37 Stephen Rothwell
2022-05-02 10:49 Stephen Rothwell
2022-05-02 11:19 ` Matthew Wilcox
2022-05-03 6:45 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230125140500.4509de80@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=vishal.moola@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox