From e83fd26ebb126dd1bf6725d72dbbd2720ab67e59 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 2 May 2024 12:42:45 +0200 Subject: [PATCH] testing/linux-sophgo: re-enable HIGHMEM Disabling HIGHMEM resulted in a kernel panic. Try re-apply the 3 previously reverted commits instead. ref: https://github.com/sophgo/linux-riscv/issues/117#issuecomment-2088444437 --- testing/linux-sophgo/APKBUILD | 6 +++--- testing/linux-sophgo/sophgo.riscv64.config | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testing/linux-sophgo/APKBUILD b/testing/linux-sophgo/APKBUILD index 871e5518b4f7..e7848d125149 100644 --- a/testing/linux-sophgo/APKBUILD +++ b/testing/linux-sophgo/APKBUILD @@ -7,7 +7,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=0 +pkgrel=1 arch=riscv64 pkgdesc="Linux Sophgo kernel" url="https://www.kernel.org" @@ -195,6 +195,6 @@ dev() { sha512sums=" 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68 linux-6.1.tar.xz dc003f0e0f4335698aa09099346cc0c72bf0a97f1430f83626afbd13eb7e6dc10d696fb11ff9825dd9854281a6aa0a9c29b22edb97e5fbb388f7b6e935c27a0b patch-6.1.89.xz -f77294af88e0f769f113b7ae0cbfdd32355642f37811a712a290550eecc6d28de478ea0708c57aef8a69e0fb772d82d062b1712766f4c17cd6f3bb06bccb6ed1 sophgo-6.1.89-alpine.patch -1ed8da93fc9d25ee6a8ccddb6d1af9272c9f0ea3c31d8d95d1ccbea0e98d0c936341de33f2e44a19871c038ff4a30db55a2137b4468efd997253933a3b0ff7d6 sophgo.riscv64.config +032f539fc2f296a838697cfa331135e084c2a4eb839d310d099b4ee755105d6861982c027863084855b46cc68cf806c6cef154a5eb8c7404e383ed0379ac0ca1 sophgo-6.1.89-alpine.patch +c06c0822898247a247bdb6cc9ebe954c1edd15376fe8ffc2c595dfd1cb2e7b63cf52b7a25fc0227b6f9681d546d690134b43e2d3bfb972e6b65696b0ff45e188 sophgo.riscv64.config " diff --git a/testing/linux-sophgo/sophgo.riscv64.config b/testing/linux-sophgo/sophgo.riscv64.config index 2f81ae3c666a..17f1bc01c3a1 100644 --- a/testing/linux-sophgo/sophgo.riscv64.config +++ b/testing/linux-sophgo/sophgo.riscv64.config @@ -306,7 +306,7 @@ CONFIG_SCHED_CLUSTER=y CONFIG_NR_CPUS=64 CONFIG_HOTPLUG_CPU=y CONFIG_TUNE_GENERIC=y -# CONFIG_HIGHMEM is not set +CONFIG_HIGHMEM=y CONFIG_FORCE_MAX_ZONEORDER=13 CONFIG_NUMA=y CONFIG_NODES_SHIFT=3