core/linux-rpi to 6.1.21-2

archlinuxarm · Mar 25, 2023 · 6cf36ea · 6cf36ea
1 parent b0a2808
commit 6cf36ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/core/linux-rpi/PKGBUILD b/core/linux-rpi/PKGBUILD
@@ -10,7 +10,7 @@ _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _regen=
 pkgver=6.1.21
-pkgrel=1
+pkgrel=2
 pkgdesc='Linux'
 url="http://www.kernel.org/"
 arch=(armv7h aarch64)
@@ -68,6 +68,10 @@ prepare() {
     if [[ $CARCH == "armv7h" ]]; then
       # https://archlinuxarm.org/forum/viewtopic.php?f=23&t=16373
       scripts/config --enable CONFIG_BCM2835_THERMAL
+      # workaround OOM killer issue
+      # https://github.com/raspberrypi/linux/issues/5395
+      # https://archlinuxarm.org/forum/viewtopic.php?f=23&t=16377
+      scripts/config --disable CONFIG_LRU_GEN_ENABLED
     fi
     sed '/^CONFIG_LOCALVERSION=/s,.*$,CONFIG_LOCALVERSION="-ARCH",' .config >$startdir/newconfig.$_config
     echo "verify that newconfig.$_config is fit for purpose then redefine $_config"

diff --git a/core/linux-rpi/config b/core/linux-rpi/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.1.19 Kernel Configuration
+# Linux/arm 6.1.21 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
 CONFIG_CC_IS_GCC=y
@@ -851,7 +851,7 @@ CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y
 # CONFIG_ANON_VMA_NAME is not set
 # CONFIG_USERFAULTFD is not set
 CONFIG_LRU_GEN=y
-CONFIG_LRU_GEN_ENABLED=y
+# CONFIG_LRU_GEN_ENABLED is not set
 # CONFIG_LRU_GEN_STATS is not set
 
 #