Browse Source

target: linux: config: Set COMPAT_32BIT_TIME on 32bit architectures

Without it, on these architectures 'lvm pvscan' will busy-loop printing:

| io_getevents failed: No such file or directory

The symbol is defined in kernel's arch/Kconfig with 'default !64BIT ||
COMPAT'. Introduce Config.in.compat which has the symbol default to y
unless a known 64bit ADK_TARGET_ARCH is enabled. Drop the symbol from
all target/*/kernel/* for which the default applies.

On 64bit systems, enabling this symbol is probably useful to provide
comaptibility towards 32bit user space. Not sure if this is a possible
choice in OpenADK, but just in case the symbol was not removed from:

- target/aarch64/kernel/raspberry-pi4-64
- target/mips64/kernel/qemu-mips64
- target/riscv64/kernel/qemu-riscv64

Another case is targets explicitly having the symbol disabled, namely
kvx. Given that the two kernel configs in question are full copies of
the kernel-generated one, they are likely not a deliberate choice and
thus removed as well.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Phil Sutter 3 months ago
parent
commit
f64b525f4f

+ 0 - 1
target/arc/kernel/qemu-arc

@@ -1,3 +1,2 @@
 CONFIG_ARC=y
 CONFIG_ARC_HAS_ACCL_REGS=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/arc/kernel/synopsys-hsdk

@@ -9,4 +9,3 @@ CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS=y
 CONFIG_ARC_HAS_LL64=y
 CONFIG_ARC_HAS_DIV_REM=y
 CONFIG_ARC_HAS_ACCL_REGS=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/arm/kernel/banana-p2-zero

@@ -37,7 +37,6 @@ CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
-CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y

+ 0 - 1
target/arm/kernel/qemu-arm-realview-eb-mpcore

@@ -16,4 +16,3 @@ CONFIG_KUSER_HELPERS=y
 CONFIG_ATAGS=y
 CONFIG_CMDLINE="console=ttyAMA0 mem=128M"
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/arm/kernel/qemu-arm-spitz

@@ -44,4 +44,3 @@ CONFIG_SERIAL_PXA_NON8250=y
 CONFIG_SERIAL_PXA_CONSOLE=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/arm/kernel/qemu-arm-terrier

@@ -44,4 +44,3 @@ CONFIG_SERIAL_PXA_NON8250=y
 CONFIG_SERIAL_PXA_CONSOLE=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/arm/kernel/qemu-arm-versatilepb

@@ -15,4 +15,3 @@ CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
 CONFIG_PLAT_VERSATILE=y
 CONFIG_VECTORS_BASE=0x00000000
 CONFIG_PHYS_OFFSET=0x00000000
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/arm/kernel/qemu-arm-vexpress-a9

@@ -13,7 +13,6 @@ CONFIG_ARM_THUMB=y
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_SWP_EMULATE=y
 CONFIG_KUSER_HELPERS=y
-CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_ARM_AMBA=y
 CONFIG_MFD_CORE=y
 CONFIG_MFD_SYSCON=y

+ 0 - 1
target/arm/kernel/raspberry-pi4

@@ -25,7 +25,6 @@ CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_CLK_BCM2711_DVP=y
 CONFIG_CLK_BCM2835=y
 CONFIG_CLK_RASPBERRYPI=y
-CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_CDEV_V1=y

+ 0 - 1
target/arm/kernel/solidrun-imx6

@@ -21,7 +21,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ATAGS_PROC=y
 CONFIG_AUTO_ZRELADDR=y
-CONFIG_COMPAT_32BIT_TIME=y
 
 CONFIG_MXC_TZIC=y
 CONFIG_MXC_AVIC=y

+ 0 - 1
target/arm/kernel/st-stm32f746g

@@ -25,4 +25,3 @@ CONFIG_DMADEVICES=y
 CONFIG_STM32_DMA=y
 CONFIG_STM32_DMAMUX=y
 CONFIG_STM32_MDMA=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/csky/kernel/qemu-csky

@@ -5,4 +5,3 @@ CONFIG_NATIONALCHIP_IRQ=y
 CONFIG_NATIONALCHIP_TIMER=y
 CONFIG_CSKYMAC=y
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/hppa/kernel/qemu-hppa

@@ -6,4 +6,3 @@ CONFIG_GSC_WAX=y
 CONFIG_GSC_DINO=y
 CONFIG_SERIAL_MUX=y
 CONFIG_SERIAL_MUX_CONSOLE=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/kvx/kernel/generic-kvx

@@ -247,7 +247,6 @@ CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_MODULES_USE_ELF_RELA=y
-# CONFIG_COMPAT_32BIT_TIME is not set
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y

+ 0 - 1
target/kvx/kernel/qemu-kvx

@@ -247,7 +247,6 @@ CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_MODULES_USE_ELF_RELA=y
-# CONFIG_COMPAT_32BIT_TIME is not set
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y

+ 1 - 0
target/linux/Config.in

@@ -28,3 +28,4 @@ source target/linux/config/Config.in.pm
 source target/linux/config/Config.in.kvm
 source target/linux/config/Config.in.virtio
 source target/linux/config/Config.in.debug
+source target/linux/config/Config.in.compat

+ 13 - 0
target/linux/config/Config.in.compat

@@ -0,0 +1,13 @@
+config ADK_LINUX_KERNEL_COMPAT_32BIT_TIME
+	bool
+	default n if ADK_TARGET_ARCH_AARCH64
+	default n if ADK_TARGET_ARCH_ALPHA
+	default n if ADK_TARGET_ARCH_IA64
+	default n if ADK_TARGET_ARCH_LOONGARCH
+	default n if ADK_TARGET_ARCH_MIPS64
+	default n if ADK_TARGET_ARCH_PPC64
+	default n if ADK_TARGET_ARCH_RISCV64
+	default n if ADK_TARGET_ARCH_S390
+	default n if ADK_TARGET_ARCH_SPARC64
+	default n if ADK_TARGET_ARCH_X86_64
+	default y

+ 0 - 1
target/m68k/kernel/aranym-m68k

@@ -6,4 +6,3 @@ CONFIG_FPU=y
 CONFIG_ATARI=y
 CONFIG_NATFEAT=y
 CONFIG_NFETH=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/m68k/kernel/qemu-m68k-mcf5208

@@ -16,4 +16,3 @@ CONFIG_RAMKERNEL=y
 CONFIG_BOOTPARAM=y
 CONFIG_BOOTPARAM_STRING="console=ttyS0,115200"
 CONFIG_CRC32=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/m68k/kernel/qemu-m68k-q800

@@ -7,4 +7,3 @@ CONFIG_ADB=y
 CONFIG_ADB_MACII=y
 CONFIG_BOOTPARAM=y
 CONFIG_BOOTPARAM_STRING=""
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/m68k/kernel/qemu-m68k-virt

@@ -1,3 +1,2 @@
 CONFIG_M68K=y
 CONFIG_VIRT=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/microblaze/kernel/qemu-microblaze-ml605

@@ -13,4 +13,3 @@ CONFIG_XILINX_MICROBLAZE0_HW_VER="8.10.a"
 CONFIG_PCI_XILINX=y
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE_FORCE=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/microblaze/kernel/qemu-microblaze-s3adsp1800

@@ -13,4 +13,3 @@ CONFIG_XILINX_MICROBLAZE0_HW_VER="7.10.d"
 CONFIG_PCI_XILINX=y
 CONFIG_CMDLINE_FORCE=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/mips/kernel/qemu-mips

@@ -3,4 +3,3 @@ CONFIG_MIPS_MALTA=y
 CONFIG_MIPS_BONITO64=y
 CONFIG_MIPS_MSC=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/nios2/kernel/qemu-nios2

@@ -10,5 +10,4 @@ CONFIG_NIOS2_DTB_SOURCE_BOOL=y
 CONFIG_NIOS2_DTB_SOURCE="10m50_devboard.dts"
 CONFIG_CMDLINE_BOOL=y
 CONFIG_NIOS2_PASS_CMDLINE=y
-CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_NIOS2_ALIGNMENT_TRAP=y

+ 0 - 1
target/or1k/kernel/qemu-or1k

@@ -6,4 +6,3 @@ CONFIG_OPENRISC_HAVE_INST_FL1=y
 CONFIG_OPENRISC_HAVE_INST_MUL=y
 CONFIG_OPENRISC_HAVE_INST_DIV=y
 CONFIG_OPENRISC_NO_SPR_SR_DSX=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/ppc/kernel/qemu-ppc-bamboo

@@ -3,4 +3,3 @@ CONFIG_PPC32=y
 CONFIG_44x=y
 CONFIG_BAMBOO=y
 CONFIG_PRINTK=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/ppc/kernel/qemu-ppc-macppc

@@ -23,4 +23,3 @@ CONFIG_ADB_CUDA=y
 CONFIG_INPUT_ADBHID=y
 CONFIG_CMDLINE_BOOL=y
 CONFIG_PRINTK=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/ppc/kernel/qemu-ppc-mpc8544ds

@@ -9,4 +9,3 @@ CONFIG_PHYS_64BIT=y
 CONFIG_SPE=y
 CONFIG_PPC_UDBG_16550=y
 CONFIG_DEFAULT_UIMAGE=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/riscv32/kernel/qemu-riscv32

@@ -1,7 +1,6 @@
 CONFIG_RISCV=y
 CONFIG_32BIT=y
 CONFIG_FPU=y
-CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_ARCH_RV32I=y
 CONFIG_SOC_VIRT=y
 CONFIG_NONPORTABLE=y

+ 0 - 1
target/sh/kernel/numato-mimasv2

@@ -15,4 +15,3 @@ CONFIG_MMC_SPI=y
 CONFIG_CLKSRC_JCORE_PIT=y
 CONFIG_JCORE_AIC=y
 CONFIG_SERIAL_EARLYCON=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/sparc/kernel/qemu-sparc

@@ -7,4 +7,3 @@ CONFIG_SERIAL_CONSOLE=y
 CONFIG_SERIAL_SUNCORE=y
 CONFIG_SERIAL_SUNZILOG=y
 CONFIG_SERIAL_SUNZILOG_CONSOLE=y
-CONFIG_COMPAT_32BIT_TIME=y

+ 0 - 1
target/x86/kernel/qemu-x86

@@ -1,4 +1,3 @@
 CONFIG_X86=y
 CONFIG_X86_32=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_COMPAT_32BIT_TIME=y