uml: refresh kernel config for v6.18

One interesting piece of information that has come up:

UML has come a long way with VFIO_PCI. But this functionality is
unused/disabled because the target doesn't set the PCI feature.

I think this feature could be added and the related CONFIG_VFIO
options could be selected by the kmod-vfio package.

That said, CONFIG_NO_IOMEM=y and friends will have to go.
So this can involve more work than one would expect.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

diff --git a/target/linux/uml/config-6.18 b/target/linux/uml/config-6.18
index e8ed1fda423b19c053198acf238dfc97d51e5882..2a5d6d47816c6f8321e8d04e10db5a17c349bd07 100644 (file)
--- a/target/linux/uml/config-6.18
+++ b/target/linux/uml/config-6.18
@@ -1,12 +1,12 @@
-CONFIG_3_LEVEL_PGTABLES=y
 CONFIG_64BIT=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_BLK_DEV_COW_COMMON=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_UBD=y
 CONFIG_BLK_DEV_UBD_SYNC=y
-CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BROADCAST_TLB_FLUSH=y
 CONFIG_BUFFER_HEAD=y
 CONFIG_CDROM=y
 # CONFIG_COMMON_CLK is not set
@@ -23,9 +23,10 @@ CONFIG_CPU_SUP_ZHAOXIN=y
 CONFIG_CRC16=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_SHA1=y
 CONFIG_DCACHE_WORD_ACCESS=y
@@ -45,7 +46,6 @@ CONFIG_FUNCTION_ALIGNMENT=0
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_FW_LOADER_SYSFS=y
 CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CPU=y
 CONFIG_GENERIC_CPU_DEVICES=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GPIO_CDEV=y
@@ -62,18 +62,13 @@ CONFIG_JBD2=y
 # CONFIG_JFFS2_FS is not set
 CONFIG_KALLSYMS=y
 CONFIG_KERNEL_STACK_ORDER=2
-CONFIG_LD_SCRIPT_DYN_RPATH=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_MATOM is not set
 CONFIG_MAY_HAVE_RUNTIME_DEPS=y
 CONFIG_MCONSOLE=y
-# CONFIG_MCORE2 is not set
 CONFIG_MIGRATION=y
-# CONFIG_MK8 is not set
 # CONFIG_MMAPPER is not set
 CONFIG_MMU_LAZY_TLB_REFCOUNT=y
 CONFIG_MODULES_USE_ELF_RELA=y
-# CONFIG_MPSC is not set
 CONFIG_NAMESPACES=y
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NET_EGRESS=y
@@ -84,16 +79,15 @@ CONFIG_NET_XGRESS=y
 CONFIG_NLS=y
 CONFIG_NO_DMA=y
 CONFIG_NO_IOMEM=y
-CONFIG_NO_IOPORT_MAP=y
 CONFIG_NR_CPUS=1
 # CONFIG_NSM is not set
 CONFIG_NULL_CHAN=y
 # CONFIG_OF is not set
+CONFIG_PAGE_BLOCK_MAX_ORDER=10
 CONFIG_PAGE_POOL=y
 CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
-CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y
-CONFIG_PGTABLE_LEVELS=3
+CONFIG_PGTABLE_LEVELS=4
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PORT_CHAN=y
 CONFIG_POSIX_MQUEUE=y
@@ -106,29 +100,21 @@ CONFIG_RANDSTRUCT_NONE=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 CONFIG_RELAY=y
-# CONFIG_SERIAL_8250 is not set
 CONFIG_SG_POOL=y
 CONFIG_SOFT_WATCHDOG=m
+CONFIG_SPARSE_IRQ=y
 CONFIG_SSL=y
 CONFIG_SSL_CHAN="pty"
 CONFIG_STACKTRACE=y
 CONFIG_STDERR_CONSOLE=y
+CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TINY_SRCU=y
-CONFIG_TOOLS_SUPPORT_RELR=y
 CONFIG_TTY_CHAN=y
 CONFIG_UML=y
-CONFIG_UML_NET=y
-CONFIG_UML_NET_DAEMON=y
-CONFIG_UML_NET_DAEMON_DEFAULT_SOCK="/tmp/uml.ctl"
-CONFIG_UML_NET_DETERMINISTIC_MAC=y
-CONFIG_UML_NET_ETHERTAP=y
-CONFIG_UML_NET_MCAST=y
-CONFIG_UML_NET_SLIP=y
-CONFIG_UML_NET_SLIRP=y
-CONFIG_UML_NET_TUNTAP=y
-# CONFIG_UML_NET_VDE is not set
+CONFIG_UML_MAX_USERSPACE_ITERATIONS=10000
 CONFIG_UML_NET_VECTOR=y
+# CONFIG_UML_PCI_OVER_VFIO is not set
 # CONFIG_UML_PCI_OVER_VIRTIO is not set
 CONFIG_UML_RANDOM=y
 CONFIG_UML_TIME_TRAVEL_SUPPORT=y
@@ -147,11 +133,12 @@ CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_X86_64=y
 CONFIG_X86_CMOV=y
-CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CX8=y
 CONFIG_X86_HAVE_PAE=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
+# CONFIG_X86_NATIVE_CPU is not set
 CONFIG_X86_TSC=y
 CONFIG_X86_VMX_FEATURE_NAMES=y
 CONFIG_XTERM_CHAN=y