Re: Concurrent Kconfig renaming, impacting your commit "drm/pagemap: Guard HPAGE_PMD_ORDER use with CONFIG_ARCH_ENABLE_THP_MIGRATION"

From: Matthew Brost

Date: Thu Jul 23 2026 - 15:46:45 EST


On Thu, Jul 23, 2026 at 09:12:26AM +0200, Lukas Bulwahn wrote:
> Hi Matthew,
>
> I noticed that the commit 0b6b1bb28482 ("mm: rename
> ARCH_ENABLE_THP_MIGRATION to ARCH_HAS_PMD_SOFTLEAVES") on linux-next
> renames the config option ARCH_ENABLE_THP_MIGRATION, which is referred
> to in this recent commit 04b177544a040 ("drm/pagemap: Guard
> HPAGE_PMD_ORDER use with CONFIG_ARCH_ENABLE_THP_MIGRATION").
>
> You might want to have a look at that.
>

Thanks, I saw some discussion on a linux-next merge conflict about this.

I think I can just do this in DRM to avoid the conflict + work with and
without 0b6b1bb28482.

-#if IS_ENABLED(CONFIG_ARCH_ENABLE_THP_MIGRATION)
+#if IS_ENABLED(CONFIG_PGTABLE_HAS_HUGE_LEAVES)
#define DRM_PAGEMAP_PMD_ORDER HPAGE_PMD_ORDER
#else
#define DRM_PAGEMAP_PMD_ORDER (-1)

Need to look at linux-next or core MM branches to confirm before I
post anything though to confirm.

Matt

> Best regards,
>
> Lukas
>