From d984517405d821c9cc28a100042596dd0fe3a13d Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 8 Sep 2021 22:08:11 +0200
Subject: [PATCH] main/linux-postmarketos-stericsson: enable CONFIG_PSI (MR
 2497)

[ci:skip-build] Will take way too long
---
 main/linux-postmarketos-stericsson/APKBUILD                | 4 ++--
 .../config-postmarketos-stericsson.armv7                   | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/main/linux-postmarketos-stericsson/APKBUILD b/main/linux-postmarketos-stericsson/APKBUILD
index 931e4f26b..3be25c672 100644
--- a/main/linux-postmarketos-stericsson/APKBUILD
+++ b/main/linux-postmarketos-stericsson/APKBUILD
@@ -5,7 +5,7 @@ _flavor="postmarketos-stericsson"
 _config="config-$_flavor.armv7"
 pkgname=linux-$_flavor
 pkgver=5.14_rc2
-pkgrel=1
+pkgrel=2
 _tag="5.14-rc2"
 pkgdesc="Mainline kernel fork for ST-Ericsson NovaThor devices"
 arch="armv7"
@@ -55,7 +55,7 @@ package() {
 
 sha512sums="
 f12cb96635631a15e806dc1488e69344ec4da62fae10866be070e915f0ba359520b0564f09bc425e588f1d6f484d337b15f1699b492d10e5d4f4908b54c93bbe  linux-postmarketos-stericsson-5.14-rc2.tar.gz
-3d5f6cc72ef6ef11f93ac92d55009d73626727d331545aaeb85f69e3c0de8790be6a1db52d6af2075bebbcf092af8f936745912be80c1b31f52bb48aa0a42874  config-postmarketos-stericsson.armv7
+7167bb4902f0872ceb6966513511e40af7125783f82f6eb3d9807b4ab7cf0ae91d0ae943c4123f9567a76ce2852876a5e38c7350767d6552b1de8d0ce618b0d7  config-postmarketos-stericsson.armv7
 66ec2d3105540e991bccc8cfb0e4212cb40a31a5a35e8cdc084b8bd7ffa016a86b3b340fd57b077b3c95b5bcb1e80cadaa11e71cd1a54a3e0e595024f3f27346  bl.patch
 760afb46cf56a97b9a9a61fabd5c686c7b98bd64864774516099ad57a7c34d146a16d7ce4687b6071c3fd2df307e7f184428924569e0e767f3c80b780720d85b  emmc.patch
 8c12e75094fde3fe50318cc478afdb2ed304ad682172e30b64ac27d536d8ccba2b6a364e62b4028e9c9ea7863e43f36dc6e3d466b29199d260d86a5995d224a1  firmware.patch
diff --git a/main/linux-postmarketos-stericsson/config-postmarketos-stericsson.armv7 b/main/linux-postmarketos-stericsson/config-postmarketos-stericsson.armv7
index 58f43e565..e20d808c8 100644
--- a/main/linux-postmarketos-stericsson/config-postmarketos-stericsson.armv7
+++ b/main/linux-postmarketos-stericsson/config-postmarketos-stericsson.armv7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.14.0-rc1 Kernel Configuration
+# Linux/arm 5.14.0-rc2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 10.3.1_git20210625) 10.3.1 20210625"
 CONFIG_CC_IS_GCC=y
@@ -104,7 +104,8 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_PSI is not set
+CONFIG_PSI=y
+# CONFIG_PSI_DEFAULT_DISABLED is not set
 # end of CPU/Task time and stats accounting
 
 CONFIG_CPU_ISOLATION=y
@@ -4788,8 +4789,6 @@ CONFIG_FONT_SUPPORT=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-CONFIG_STACKDEPOT=y
-CONFIG_STACK_HASH_ORDER=20
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set
 # end of Library routines