From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Zach O'Keefe <zokeefe@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Michael Ellerman <mpe@ellerman.id.au>
Subject: linux-next: build warning after merge of the mm tree
Date: Thu, 21 Jul 2022 19:55:08 +1000 [thread overview]
Message-ID: <20220721195508.15f1e07a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2993 bytes --]
Hi all,
After merging the mm tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:
In file included from arch/powerpc/include/asm/book3s/64/mmu-hash.h:20,
from arch/powerpc/include/asm/book3s/64/mmu.h:32,
from arch/powerpc/include/asm/mmu.h:393,
from arch/powerpc/include/asm/lppaca.h:46,
from arch/powerpc/include/asm/paca.h:18,
from arch/powerpc/include/asm/current.h:13,
from include/linux/thread_info.h:23,
from include/asm-generic/preempt.h:5,
from ./arch/powerpc/include/generated/asm/preempt.h:1,
from include/linux/preempt.h:78,
from include/linux/spinlock.h:55,
from include/linux/mmzone.h:8,
from include/linux/gfp.h:7,
from include/linux/mm.h:7,
from mm/khugepaged.c:4:
arch/powerpc/include/asm/book3s/64/pgtable.h:190:25: warning: "__pte_index_size" is not defined, evaluates to 0 [-Wundef]
190 | #define PTE_INDEX_SIZE __pte_index_size
| ^~~~~~~~~~~~~~~~
arch/powerpc/include/asm/book3s/64/pgtable.h:241:39: note: in expansion of macro 'PTE_INDEX_SIZE'
241 | #define PMD_SHIFT (PAGE_SHIFT + PTE_INDEX_SIZE)
| ^~~~~~~~~~~~~~
include/linux/huge_mm.h:109:25: note: in expansion of macro 'PMD_SHIFT'
109 | #define HPAGE_PMD_SHIFT PMD_SHIFT
| ^~~~~~~~~
include/linux/huge_mm.h:105:26: note: in expansion of macro 'HPAGE_PMD_SHIFT'
105 | #define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT)
| ^~~~~~~~~~~~~~~
mm/khugepaged.c:95:5: note: in expansion of macro 'HPAGE_PMD_ORDER'
95 | #if HPAGE_PMD_ORDER < 16
| ^~~~~~~~~~~~~~~
Introduced by commit
adcc4e193b6b ("mm/khugepaged: use minimal bits to store num page < HPAGE_PMD_NR")
So HPAGE_PMD_ORDER is not a constant on ppc64 ...
I applied this hack for today (which makes it build without warning and
puts things more or less back as they were for ppo64).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 21 Jul 2022 19:49:40 +1000
Subject: [PATCH] fix up for "mm/khugepaged: use minimal bits to store num page < HPAGE_PMD_NR"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
mm/khugepaged.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 28cb8429dad4..d8e388106322 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -92,7 +92,9 @@ struct collapse_control {
bool is_khugepaged;
/* Num pages scanned per node */
-#if HPAGE_PMD_ORDER < 16
+#if defined(CONFIG_PPC64)
+ u32 node_load[MAX_NUMNODES];
+#elif HPAGE_PMD_ORDER < 16
u16 node_load[MAX_NUMNODES];
#else
u32 node_load[MAX_NUMNODES];
--
2.35.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-07-21 9:55 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-21 9:55 Stephen Rothwell [this message]
2022-07-21 11:11 ` linux-next: build warning after merge of the mm tree Zach O'Keefe
-- strict thread matches above, loose matches on Subject: below --
2024-05-07 6:26 Stephen Rothwell
2024-04-17 5:18 Stephen Rothwell
2024-04-17 15:57 ` Matthew Wilcox
2024-04-15 5:20 Stephen Rothwell
2024-04-15 5:45 ` Barry Song
2024-03-27 22:13 Stephen Rothwell
2024-03-28 1:59 ` Baoquan He
2024-03-28 4:29 ` Stephen Rothwell
2024-03-25 1:25 Stephen Rothwell
2024-03-26 2:21 ` Suren Baghdasaryan
2024-03-25 1:22 Stephen Rothwell
2024-03-25 8:56 ` David Hildenbrand
2024-03-13 4:07 Stephen Rothwell
2024-03-13 9:00 ` Uwe Kleine-König
2024-03-13 15:22 ` Masahiro Yamada
2024-03-13 21:11 ` Uwe Kleine-König
2024-01-02 5:40 Stephen Rothwell
2024-01-02 12:54 ` Kirill A. Shutemov
2023-12-04 4:54 Stephen Rothwell
2023-12-04 17:03 ` SeongJae Park
2023-11-28 2:33 Stephen Rothwell
2023-10-04 4:46 Stephen Rothwell
2023-09-25 23:27 Stephen Rothwell
2023-09-18 3:18 Stephen Rothwell
2023-09-12 5:20 Stephen Rothwell
2023-06-05 3:10 Stephen Rothwell
2023-06-05 14:57 ` Liam R. Howlett
2023-05-15 23:25 Stephen Rothwell
2023-05-08 1:19 Stephen Rothwell
2023-05-08 21:36 ` Nhat Pham
2023-03-20 3:47 Stephen Rothwell
2023-03-23 2:58 ` Stephen Rothwell
2023-03-23 19:38 ` Andrew Morton
2023-03-16 1:12 Stephen Rothwell
2023-03-01 0:36 Stephen Rothwell
2023-03-01 0:47 ` Suren Baghdasaryan
2023-03-01 2:29 ` Suren Baghdasaryan
2023-03-01 5:45 ` Stephen Rothwell
2023-01-17 3:51 Stephen Rothwell
2022-12-17 19:22 Stephen Rothwell
2022-11-10 7:36 Stephen Rothwell
2022-11-10 7:33 Stephen Rothwell
2022-11-10 16:27 ` Linus Torvalds
2022-11-10 20:20 ` Randy Dunlap
2022-11-10 20:43 ` Jonathan Corbet
2022-10-26 0:57 Stephen Rothwell
2022-10-26 1:13 ` Sergey Senozhatsky
2022-09-19 9:09 Stephen Rothwell
2022-09-19 9:30 ` Miaohe Lin
2022-07-18 10:28 Stephen Rothwell
2022-07-18 22:54 ` Andrew Morton
2022-06-22 5:54 Stephen Rothwell
2022-06-22 7:11 ` Stephen Rothwell
2022-06-22 16:39 ` Mike Kravetz
2022-06-22 18:49 ` Andrew Morton
2022-05-25 5:54 Stephen Rothwell
2022-05-25 10:57 ` Zi Yan
2022-05-25 17:36 ` Andrew Morton
2022-05-12 9:46 Stephen Rothwell
2022-05-12 12:23 ` Johannes Weiner
2022-05-05 21:35 Stephen Rothwell
2022-05-05 21:38 ` Stephen Rothwell
2022-05-05 22:18 ` Matthew Wilcox
2022-04-28 7:44 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=20220721195508.15f1e07a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mpe@ellerman.id.au \
--cc=zokeefe@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).