Merge branch 'istoreos-23.05' of https://github.com/istoreos/istoreos into istoreos-23.05

Fix errors on N5105 on ffmpeg transcoding:
```
[  245.624603] i915 0000:00:02.0: GPU HANG: ecode 11:0:00000000
[  245.624733] i915 0000:00:02.0: [drm] Resetting chip for unable to handle EU attention on rcs0, error:-107
[  245.631804] i915 0000:00:02.0: [drm] ffmpeg[20389] context reset due to GPU hang
```

package/firmware/intel-gpu-firmware/Makefile

@@ -29,12 +29,33 @@ endef
 
 define Package/i915-oot-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware/i915
+
+	# don't include firmwares in package/firmware/linux-firmware/intel.mk:i915-firmware
+
+	# drivers/gpu/drm/i915/display/intel_dmc.c:intel_dmc_ucode_init
+	# METEORLAKE
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/mtl_dmc_ver2_12.bin $(1)/lib/firmware/i915/
+	# DG2
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/dg2_dmc_ver2_07.bin $(1)/lib/firmware/i915/
+	# ALDERLAKE_P ALDERLAKE_P_N
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/adlp_dmc_ver2_16.bin $(1)/lib/firmware/i915/
+
 	# drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c:INTEL_UC_FIRMWARE_DEFS
 	## guc
+	# METEORLAKE
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/mtl_guc_70.6.8.bin $(1)/lib/firmware/i915/
+	# PONTEVECCHIO
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/pvc_guc_70.7.0.bin $(1)/lib/firmware/i915/
+	# DG2
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/dg2_guc_70.7.0.bin $(1)/lib/firmware/i915/
+	# XEHPSDV (skip for i915-oot driver not support yet)
+	# $(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/xehpsdv_guc_70.7.0.bin $(1)/lib/firmware/i915/
 	# ALDERLAKE_P
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/adlp_guc_70.7.0.bin $(1)/lib/firmware/i915/
 	# ALDERLAKE_S ALDERLAKE_P_N ROCKETLAKE TIGERLAKE
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/tgl_guc_70.7.0.bin $(1)/lib/firmware/i915/
+	# DG1
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/dg1_guc_70.7.0.bin $(1)/lib/firmware/i915/
 	# JASPERLAKE ELKHARTLAKE
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/ehl_guc_70.7.0.bin $(1)/lib/firmware/i915/
 	# ICELAKE
@@ -50,6 +71,20 @@ define Package/i915-oot-firmware/install
 	# SKYLAKE
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/skl_guc_70.7.0.bin $(1)/lib/firmware/i915/
 
+	## huc
+	# METEORLAKE
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/mtl_huc_8.3.7_gsc.bin $(1)/lib/firmware/i915/
+	# PONTEVECCHIO
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/pvc_huc_7.8.7.bin $(1)/lib/firmware/i915/
+	# DG2
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/dg2_huc_7.10.3_gsc.bin $(1)/lib/firmware/i915/
+	# DG1
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/dg1_huc_7.9.3.bin $(1)/lib/firmware/i915/
+
+	## gsc
+	# METEORLAKE
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/firmware/mtl_gsc_102.0.0.7366.bin $(1)/lib/firmware/i915/
+
 endef
 
 $(eval $(call BuildPackage,i915-oot-firmware))

package/kernel/i915-oot/Makefile

@@ -53,7 +53,7 @@ define KernelPackage/drm-i915-oot
 	$(PKG_BUILD_DIR)/drivers/gpu/drm/i915/gvt/kvmgt.ko \
 	$(PKG_BUILD_DIR)/drivers/gpu/drm/i915/fabric/iaf.ko
   AUTOLOAD:=$(call AutoProbe,i915)
-  MODPARAMS.i915:=enable_guc=3 max_vfs=7 enable_gvt=1
+  MODPARAMS.i915:=enable_guc=3 max_vfs=7 enable_gvt=1 force_probe=*
 endef
 
 define KernelPackage/drm-i915-oot/description

package/kernel/i915-oot/patches/006-fix-gpu-hang-errors.patch

@@ -0,0 +1,28 @@
+From 72e08c7c45c470c990cd8b61e46e99c18026ad69 Mon Sep 17 00:00:00 2001
+From: Liangbin Lian <jjm2473@gmail.com>
+Date: Thu, 21 Sep 2023 10:58:09 +0800
+Subject: [PATCH] fix "GPU HANG" errors on N5105
+
+fix https://github.com/intel-gpu/intel-gpu-i915-backports/issues/126
+
+Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
+---
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+index 37bd700..52eccfa 100644
+--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
++++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+@@ -551,7 +551,7 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id,
+ 		engine->flags |= I915_ENGINE_HAS_EU_PRIORITY;
+ 
+ 		/* EU attention is not available on VFs */
+-		if(!IS_SRIOV_VF(gt->i915))
++		if (HAS_SRIOV(i915) && !IS_SRIOV_VF(i915))
+ 			engine->flags |= I915_ENGINE_HAS_EU_ATTENTION;
+ 
+ 		/* we only care about run alone on platforms that have a CCS */
+-- 
+2.31.0
+

package/kernel/linux/modules/netdevices.mk

@@ -714,7 +714,7 @@ define KernelPackage/r8169
     CONFIG_R8169_NAPI=y \
     CONFIG_R8169_VLAN=n
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/r8169.ko
-  AUTOLOAD:=$(call AutoLoad,35-1,r8169)
+  AUTOLOAD:=$(call AutoLoad,35,r8169)
 endef
 
 define KernelPackage/r8169/description
@@ -840,7 +840,7 @@ define KernelPackage/ixgbe
     CONFIG_IXGBE_HWMON=y \
     CONFIG_IXGBE_DCA=n
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
-  AUTOLOAD:=$(call AutoLoad,35,ixgbe)
+  AUTOLOAD:=$(call AutoLoad,36,ixgbe)
 endef
 
 define KernelPackage/ixgbe/description
@@ -859,7 +859,7 @@ define KernelPackage/ixgbevf
     CONFIG_IXGBE_HWMON=y \
     CONFIG_IXGBE_DCA=n
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/ixgbevf/ixgbevf.ko
-  AUTOLOAD:=$(call AutoLoad,35,ixgbevf)
+  AUTOLOAD:=$(call AutoLoad,36,ixgbevf)
 endef
 
 define KernelPackage/ixgbevf/description

package/kernel/linux/modules/sound.mk

@@ -212,6 +212,35 @@ endef
 
 $(eval $(call KernelPackage,sound-soc-ac97))
 
+define KernelPackage/sound-soc-acpi
+  TITLE:=snd-soc-acpi
+  HIDDEN:=1
+  FILES:= \
+	$(LINUX_DIR)/sound/soc/snd-soc-acpi.ko
+  DEPENDS:=+kmod-sound-soc-core
+endef
+
+$(eval $(call KernelPackage,sound-soc-acpi))
+
+define KernelPackage/sound-soc-acpi-intel-match
+  TITLE:=snd-soc-acpi-intel-match
+  HIDDEN:=1
+  FILES:= \
+	$(LINUX_DIR)/sound/soc/intel/common/snd-soc-acpi-intel-match.ko
+  DEPENDS:=+kmod-sound-soc-acpi
+endef
+
+$(eval $(call KernelPackage,sound-soc-acpi-intel-match))
+
+define KernelPackage/sound-soc-hdac-hda
+  TITLE:=snd-soc-hdac-hda
+  HIDDEN:=1
+  FILES:= \
+	$(LINUX_DIR)/sound/soc/codecs/snd-soc-hdac-hda.ko
+  DEPENDS:=+kmod-sound-soc-core +kmod-sound-hda-ext-core
+endef
+
+$(eval $(call KernelPackage,sound-soc-hdac-hda))
 
 define KernelPackage/sound-soc-imx
   TITLE:=IMX SoC support
@@ -326,6 +355,16 @@ endef
 
 $(eval $(call KernelPackage,sound-hda-core))
 
+define KernelPackage/sound-hda-ext-core
+  TITLE:=HD Audio Sound Ext Core Support
+  HIDDEN:=1
+  FILES:= \
+	$(LINUX_DIR)/sound/hda/ext/snd-hda-ext-core.ko
+  $(call AddDepends/sound,kmod-sound-hda-core)
+endef
+
+$(eval $(call KernelPackage,sound-hda-ext-core))
+
 define KernelPackage/sound-hda-codec-realtek
   SUBMENU:=$(SOUND_MENU)
   TITLE:= HD Audio Realtek Codec
@@ -533,3 +572,112 @@ define KernelPackage/sound-hda-intel/description
 endef
 
 $(eval $(call KernelPackage,sound-hda-intel))
+
+define KernelPackage/sound-soc-sof
+  TITLE:=Sound Open Firmware Support
+  DEPENDS:=+kmod-sound-soc-core +kmod-ledtrig-audio
+  HIDDEN:=1
+  KCONFIG:= \
+	CONFIG_SND_SOC_SOF_TOPLEVEL=y
+  FILES:= \
+	$(LINUX_DIR)/sound/soc/sof/snd-sof.ko
+  AUTOLOAD:=$(call AutoLoad,57,snd-sof)
+  $(call AddDepends/sound)
+endef
+
+$(eval $(call KernelPackage,sound-soc-sof))
+
+define KernelPackage/sound-soc-sof-acpi
+  TITLE:=Sound Open Firmware ACPI Support
+  DEPENDS:=@TARGET_x86 +kmod-sound-soc-sof
+  KCONFIG:= \
+	CONFIG_SND_SOC_SOF_ACPI
+  HIDDEN:=1
+  FILES:= \
+	$(LINUX_DIR)/sound/soc/sof/snd-sof-acpi.ko
+  AUTOLOAD:=$(call AutoLoad,58,snd-sof-acpi)
+  $(call AddDepends/sound)
+endef
+
+$(eval $(call KernelPackage,sound-soc-sof-acpi))
+
+define KernelPackage/sound-soc-sof-pci
+  TITLE:=Sound Open Firmware PCI Support
+  DEPENDS:=@PCI_SUPPORT +kmod-sound-soc-sof
+  KCONFIG:= \
+	CONFIG_SND_SOC_SOF_PCI
+  HIDDEN:=1
+  FILES:= \
+	$(LINUX_DIR)/sound/soc/sof/snd-sof-pci.ko
+  AUTOLOAD:=$(call AutoLoad,58,snd-sof-pci)
+  $(call AddDepends/sound)
+endef
+
+$(eval $(call KernelPackage,sound-soc-sof-pci))
+
+define KernelPackage/sound-sof-xtensa-dsp
+  TITLE:=snd-sof-xtensa-dsp
+  DEPENDS:=+kmod-sound-soc-sof
+  HIDDEN:=1
+  FILES:= \
+	$(LINUX_DIR)/sound/soc/sof/xtensa/snd-sof-xtensa-dsp.ko
+  $(call AddDepends/sound)
+endef
+
+$(eval $(call KernelPackage,sound-sof-xtensa-dsp))
+
+define KernelPackage/sound-soc-sof-intel
+  SUBMENU:=$(SOUND_MENU)
+  TITLE:=SOF support for Intel audio DSPs
+  DEPENDS:=@TARGET_x86 +kmod-sound-soc-sof +kmod-sound-soc-sof-acpi +kmod-sound-soc-sof-pci \
+	+kmod-sound-sof-xtensa-dsp \
+	+kmod-sound-soc-hdac-hda +kmod-sound-soc-acpi-intel-match
+  KCONFIG:= \
+	CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y \
+	CONFIG_SND_SOC_SOF_BAYTRAIL \
+	CONFIG_SND_SOC_SOF_BROADWELL \
+	CONFIG_SND_SOC_SOF_MERRIFIELD \
+	CONFIG_SND_SOC_SOF_APOLLOLAKE \
+	CONFIG_SND_SOC_SOF_GEMINILAKE \
+	CONFIG_SND_SOC_SOF_CANNONLAKE \
+	CONFIG_SND_SOC_SOF_COFFEELAKE \
+	CONFIG_SND_SOC_SOF_COMETLAKE \
+	CONFIG_SND_SOC_SOF_ICELAKE \
+	CONFIG_SND_SOC_SOF_JASPERLAKE \
+	CONFIG_SND_SOC_SOF_TIGERLAKE \
+	CONFIG_SND_SOC_SOF_ELKHARTLAKE \
+	CONFIG_SND_SOC_SOF_ALDERLAKE \
+	CONFIG_SND_SOC_SOF_HDA_LINK=y \
+	CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y \
+	CONFIG_SND_SOC_SOF_HDA_PROBES=y \
+	CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=n \
+	CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=n \
+	CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=n \
+	CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=n
+
+  FILES:= \
+	$(LINUX_DIR)/sound/soc/sof/intel/snd-sof-intel-atom.ko \
+	$(LINUX_DIR)/sound/soc/sof/intel/snd-sof-acpi-intel-byt.ko \
+	$(LINUX_DIR)/sound/soc/sof/intel/snd-sof-acpi-intel-bdw.ko \
+	$(LINUX_DIR)/sound/soc/sof/intel/snd-sof-intel-ipc.ko \
+	$(LINUX_DIR)/sound/soc/sof/intel/snd-sof-intel-hda-common.ko \
+	$(LINUX_DIR)/sound/soc/sof/intel/snd-sof-intel-hda.ko \
+	$(LINUX_DIR)/sound/soc/sof/intel/snd-sof-pci-intel-tng.ko \
+	$(LINUX_DIR)/sound/soc/sof/intel/snd-sof-pci-intel-apl.ko \
+	$(LINUX_DIR)/sound/soc/sof/intel/snd-sof-pci-intel-cnl.ko \
+	$(LINUX_DIR)/sound/soc/sof/intel/snd-sof-pci-intel-icl.ko \
+	$(LINUX_DIR)/sound/soc/sof/intel/snd-sof-pci-intel-tgl.ko
+  AUTOLOAD:=$(call AutoProbe,snd-sof-intel-ipc snd-sof-intel-atom \
+	snd-sof-acpi-intel-bdw snd-sof-acpi-intel-byt \
+	snd-sof-intel-hda-common snd-sof-intel-hda \
+	snd-sof-pci-intel-tng snd-sof-pci-intel-apl \
+	snd-sof-pci-intel-cnl snd-sof-pci-intel-icl \
+	snd-sof-pci-intel-tgl)
+  $(call AddDepends/sound,kmod-sound-hda-intel)
+endef
+
+define KernelPackage/sound-soc-sof-intel/description
+ Kernel modules for Sound Open Firmware for Intel platforms support
+endef
+
+$(eval $(call KernelPackage,sound-soc-sof-intel))

package/kernel/linux/modules/video.mk

@@ -1099,3 +1099,19 @@ define KernelPackage/drm-i915/description
 endef
 
 $(eval $(call KernelPackage,drm-i915))
+
+define KernelPackage/drm-i915-kvmgt
+  SUBMENU:=$(VIDEO_MENU)
+  TITLE:=Intel GPU GVT-g support
+  DEPENDS:=@TARGET_x86 +kmod-drm-i915 +kmod-kvm-x86 +kmod-vfio-mdev
+  KCONFIG:= \
+	CONFIG_DRM_I915_GVT_KVMGT
+  FILES:=$(LINUX_DIR)/drivers/gpu/drm/i915/gvt/kvmgt.ko
+  AUTOLOAD:=$(call AutoProbe,kvmgt)
+endef
+
+define KernelPackage/drm-i915-kvmgt/description
+  Enable KVM/VFIO support for Intel GVT-g
+endef
+
+$(eval $(call KernelPackage,drm-i915-kvmgt))

package/kernel/linux/modules/virt.mk

@@ -119,7 +119,8 @@ define KernelPackage/vfio-pci
   DEPENDS:=@TARGET_x86_64 @PCI_SUPPORT +kmod-vfio +kmod-irqbypass
   KCONFIG:= \
 	CONFIG_VFIO_PCI \
-	CONFIG_VFIO_PCI_IGD=n
+	CONFIG_VFIO_PCI_VGA=y \
+	CONFIG_VFIO_PCI_IGD=y
   FILES:= \
 	$(LINUX_DIR)/drivers/vfio/pci/vfio-pci-core.ko \
 	$(LINUX_DIR)/drivers/vfio/pci/vfio-pci.ko

package/kernel/r8125/Makefile

@@ -27,7 +27,7 @@ define KernelPackage/r8125
   SUBMENU:=Network Devices
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:= $(PKG_BUILD_DIR)/src/r8125.ko
-  AUTOLOAD:=$(call AutoProbe,r8125)
+  AUTOLOAD:=$(call AutoLoad,35,r8125)
 endef
 
 define KernelPackage/r8125/description

package/kernel/r8168/Makefile

@@ -16,7 +16,7 @@ define KernelPackage/$(PKG_NAME)
   SUBMENU:=Network Devices
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE)
   FILES:=$(PKG_BUILD_DIR)/src/r8168.ko
-  AUTOLOAD:=$(call AutoProbe,r8168)
+  AUTOLOAD:=$(call AutoLoad,35,r8168)
 endef
 
 define KernelPackage/$(PKG_NAME)/description

target/linux/generic/config-5.15

@@ -6115,6 +6115,13 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
 # CONFIG_SND_SOC_SIMPLE_MUX is not set
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 # CONFIG_SND_SOC_SOF_TOPLEVEL is not set
+# CONFIG_SND_SOC_SOF_PCI is not set
+# CONFIG_SND_SOC_SOF_ACPI is not set
+# CONFIG_SND_SOC_SOF_OF is not set
+# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set
+# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_IMX_TOPLEVEL is not set
+# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
 # CONFIG_SND_SOC_SPDIF is not set
 # CONFIG_SND_SOC_SSM2305 is not set
 # CONFIG_SND_SOC_SSM2518 is not set

target/linux/x86/64/config-5.15

@@ -213,6 +213,7 @@ CONFIG_HOTPLUG_SMT=y
 CONFIG_HPET=y
 CONFIG_HPET_MMAP=y
 # CONFIG_HP_ACCEL is not set
+CONFIG_HUGETLBFS=y
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
@@ -387,6 +388,7 @@ CONFIG_PVH=y
 CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
 CONFIG_RAS=y
+# CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_RELAY=y
 CONFIG_RELOCATABLE=y
 CONFIG_RESET_ATTACK_MITIGATION=y
@@ -429,14 +431,23 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 # CONFIG_TOSHIBA_BT_RFKILL is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 # CONFIG_UACCE is not set
 # CONFIG_UCLAMP_TASK is not set
 CONFIG_UCS2_STRING=y
+CONFIG_UDMABUF=y
 # CONFIG_UNWINDER_ORC is not set
 CONFIG_USB_STORAGE=y
 CONFIG_USB_UAS=y
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VHOST_NET=y
+CONFIG_VHOST_VSOCK=y
+# CONFIG_VSOCKMON is not set
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_BLK=y

target/linux/x86/patches-5.15/301-dummy-mmap-rnd-compat-bits.diff

@@ -0,0 +1,62 @@
+From 25f2d9e65074d714d8e69d2e30f404465a8eb1bd Mon Sep 17 00:00:00 2001
+From: jjm2473 <1129525450@qq.com>
+Date: Wed, 13 Sep 2023 11:33:31 +0800
+Subject: [PATCH] mm/mmap: add mmap_rnd_compat_bits api for not compat kernel
+
+---
+ include/linux/mm.h | 3 +--
+ kernel/sysctl.c    | 2 --
+ mm/mmap.c          | 7 +++++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/include/linux/mm.h b/include/linux/mm.h
+index a27a6b5..596c791 100644
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -91,8 +91,7 @@ extern int sysctl_legacy_va_layout;
+ extern const int mmap_rnd_bits_min;
+ extern const int mmap_rnd_bits_max;
+ extern int mmap_rnd_bits __read_mostly;
+-#endif
+-#ifdef CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS
++
+ extern const int mmap_rnd_compat_bits_min;
+ extern const int mmap_rnd_compat_bits_max;
+ extern int mmap_rnd_compat_bits __read_mostly;
+diff --git a/kernel/sysctl.c b/kernel/sysctl.c
+index 928798f..ccbc0c0 100644
+--- a/kernel/sysctl.c
++++ b/kernel/sysctl.c
+@@ -3150,8 +3150,6 @@ static struct ctl_table vm_table[] = {
+ 		.extra1		= (void *)&mmap_rnd_bits_min,
+ 		.extra2		= (void *)&mmap_rnd_bits_max,
+ 	},
+-#endif
+-#ifdef CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS
+ 	{
+ 		.procname	= "mmap_rnd_compat_bits",
+ 		.data		= &mmap_rnd_compat_bits,
+diff --git a/mm/mmap.c b/mm/mmap.c
+index a0a4ead..d36d9e7 100644
+--- a/mm/mmap.c
++++ b/mm/mmap.c
+@@ -66,11 +66,14 @@
+ const int mmap_rnd_bits_min = CONFIG_ARCH_MMAP_RND_BITS_MIN;
+ const int mmap_rnd_bits_max = CONFIG_ARCH_MMAP_RND_BITS_MAX;
+ int mmap_rnd_bits __read_mostly = CONFIG_ARCH_MMAP_RND_BITS;
+-#endif
+-#ifdef CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS
++
+ const int mmap_rnd_compat_bits_min = CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN;
+ const int mmap_rnd_compat_bits_max = CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX;
++#ifdef CONFIG_ARCH_MMAP_RND_COMPAT_BITS
+ int mmap_rnd_compat_bits __read_mostly = CONFIG_ARCH_MMAP_RND_COMPAT_BITS;
++#else
++int mmap_rnd_compat_bits __read_mostly = CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN;
++#endif
+ #endif
+ 
+ static bool ignore_rlimit_data;
+-- 
+2.31.0
+