um: require MMU for UML PCI support

Because UML_PCI (arch/um/drivers/Kconfig) selects FORCE_PCI, this
contradicts the current dependency of CONFIG_PCI on CONFIG_MMU.  This
commit fixes this issue by adding right dependencies under !MMU
environment.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202609271139.DpjVdepU-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202609271351.tw8EOsgz-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202609270410.Kc2FsJp1-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202609270228.yku16Noi-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202609270416.rEtAiqyF-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202609270538.mV3NDkLu-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202609271435.lANS7mTP-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202609271512.pg5gWbIg-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202609271717.pg5HjzeZ-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202609271810.pxMMu5ZC-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202609271940.FhRl0cBi-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202609272107.sLZJEOtt-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202609272234.F8tROOdL-lkp@intel.com/
Fixes: 626ff2b34d ("um: allow deselecting CONFIG_MMU")
Signed-off-by: Hajime Tazaki <thehajime@gmail.com>
Link: https://patch.msgid.link/20260927234537.1585880-1-thehajime@gmail.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Hajime Tazaki 2026-09-28 08:45:37 +09:00 committed by Johannes Berg
parent 0630560dd7
commit fa6a0e7a8b
2 changed files with 4 additions and 1 deletions

View File

@ -159,6 +159,7 @@ config UML_RTC
config UML_PCI
bool
depends on MMU
select FORCE_PCI
select IRQ_MSI_LIB
select UML_IOMEM_EMULATION
@ -169,6 +170,7 @@ config UML_PCI
config UML_PCI_OVER_VIRTIO
bool "Enable PCI over VIRTIO device simulation"
# in theory, just VIRTIO is enough, but that causes recursion
depends on MMU
depends on VIRTIO_UML
select UML_PCI
@ -183,6 +185,7 @@ config UML_PCI_OVER_VIRTIO_DEVICE_ID
config UML_PCI_OVER_VFIO
bool "Enable VFIO-based PCI passthrough"
depends on MMU
select UML_PCI
help
This driver provides support for VFIO-based PCI passthrough.

View File

@ -133,7 +133,7 @@ config KUNIT_DEFAULT_TIMEOUT
config KUNIT_UML_PCI
bool "KUnit UML PCI Support"
depends on UML
depends on UML && MMU
select UML_PCI
help
Enables the PCI subsystem on UML for use by KUnit tests.