All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] RISC-V: fixup in-flight collision with ARCH_WANT_OPTIMIZE_VMEMMAP rename
@ 2023-04-29  9:27 ` Conor Dooley
  0 siblings, 0 replies; 16+ messages in thread
From: Conor Dooley @ 2023-04-29  9:27 UTC (permalink / raw)
  To: palmer
  Cc: conor, Conor Dooley, Lukas Bulwhan, Linus Torvalds, Andrew Morton,
	Aneesh Kumar K . V, linux-riscv, linux-kernel

From: Conor Dooley <conor.dooley@microchip.com>

Lukas warned that ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP had been
renamed in the mm tree & that RISC-V would need a fixup as part of the
merge. The warning was missed however, and RISC-V is selecting the
orphaned Kconfig option.

Fixes: 89d77f71f493 ("Merge tag 'riscv-for-linus-6.4-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux")
Reported-by: Lukas Bulwhan <lukas.bulwhan@gmail.com>
Link: https://lore.kernel.org/linux-riscv/CAKXUXMyVeg2kQK_edKHtMD3eADrDK_PKhCSVkMrLDdYgTQQ5rg@mail.gmail.com/
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
I guess you picking this up for your second PR makes the most sense
Palmer?

CC: Palmer Dabbelt <palmer@dabbelt.com>
CC: Linus Torvalds <torvalds@linux-foundation.org>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
CC: Lukas Bulwhan <lukas.bulwhan@gmail.com>
CC: linux-riscv@lists.infradead.org
CC: linux-kernel@vger.kernel.org
---
 arch/riscv/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 5c88ac4b52be..e1bdb3fb16cc 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -46,9 +46,9 @@ config RISCV
 	select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
 	select ARCH_WANT_FRAME_POINTERS
 	select ARCH_WANT_GENERAL_HUGETLB if !RISCV_ISA_SVNAPOT
-	select ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP
 	select ARCH_WANT_HUGE_PMD_SHARE if 64BIT
 	select ARCH_WANT_LD_ORPHAN_WARN if !XIP_KERNEL
+	select ARCH_WANT_OPTIMIZE_VMEMMAP
 	select ARCH_WANTS_THP_SWAP if HAVE_ARCH_TRANSPARENT_HUGEPAGE
 	select BINFMT_FLAT_NO_DATA_START_OFFSET if !MMU
 	select BUILDTIME_TABLE_SORT if MMU
-- 
2.39.2


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2023-05-02  5:50 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-29  9:27 [PATCH] RISC-V: fixup in-flight collision with ARCH_WANT_OPTIMIZE_VMEMMAP rename Conor Dooley
2023-04-29  9:27 ` Conor Dooley
2023-04-29  9:32 ` Conor Dooley
2023-04-29  9:32   ` Conor Dooley
2023-04-29 20:17   ` Palmer Dabbelt
2023-04-29 20:17     ` Palmer Dabbelt
2023-04-29 21:48     ` Konstantin Ryabitsev
2023-04-29 21:48       ` Konstantin Ryabitsev
2023-04-29 22:31       ` Palmer Dabbelt
2023-04-29 22:31         ` Palmer Dabbelt
2023-05-01 22:52   ` Palmer Dabbelt
2023-05-01 22:52     ` Palmer Dabbelt
2023-05-02  5:49     ` Conor Dooley
2023-05-02  5:49       ` Conor Dooley
2023-05-01 22:44 ` Palmer Dabbelt
2023-05-01 22:44   ` Palmer Dabbelt

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.