Skip to content

Archlinux Kernel based on different schedulers and some other performance improvements.

Fix incorrect _processor_opt handling for x86-64 levels (#261)

Vasiliy Stelmachenok30dba8fe2133
diff --git a/linux-bore/PKGBUILD b/linux-bore/PKGBUILD
index 3730be57..31e500e8 100644
--- a/linux-bore/PKGBUILD
+++ b/linux-bore/PKGBUILD
@@ -266,7 +266,14 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=M${MARCH}
+ MARCH2=${MARCH}
+
+ if [[ ! "$MARCH" =~ GENERIC* ]]; then
+ MARCH2="M${MARCH}"
+ else
+ MARCH2="${MARCH/V/CPU}"
+ fi
+
scripts/config -k -d CONFIG_GENERIC_CPU
scripts/config -k -e CONFIG_${MARCH2}
fi
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
index cbe9e993..f933962a 100644
--- a/linux-cachyos-bore/PKGBUILD
+++ b/linux-cachyos-bore/PKGBUILD
@@ -266,7 +266,14 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=M${MARCH}
+ MARCH2=${MARCH}
+
+ if [[ ! "$MARCH" =~ GENERIC* ]]; then
+ MARCH2="M${MARCH}"
+ else
+ MARCH2="${MARCH/V/CPU}"
+ fi
+
scripts/config -k -d CONFIG_GENERIC_CPU
scripts/config -k -e CONFIG_${MARCH2}
fi
diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD
index 0ba6ca9d..8102893d 100644
--- a/linux-cachyos-deckify/PKGBUILD
+++ b/linux-cachyos-deckify/PKGBUILD
@@ -268,7 +268,14 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=M${MARCH}
+ MARCH2=${MARCH}
+
+ if [[ ! "$MARCH" =~ GENERIC* ]]; then
+ MARCH2="M${MARCH}"
+ else
+ MARCH2="${MARCH/V/CPU}"
+ fi
+
scripts/config -k -d CONFIG_GENERIC_CPU
scripts/config -k -e CONFIG_${MARCH2}
fi
diff --git a/linux-cachyos-echo/PKGBUILD b/linux-cachyos-echo/PKGBUILD
index f9e08221..992aa33e 100644
--- a/linux-cachyos-echo/PKGBUILD
+++ b/linux-cachyos-echo/PKGBUILD
@@ -266,7 +266,14 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=M${MARCH}
+ MARCH2=${MARCH}
+
+ if [[ ! "$MARCH" =~ GENERIC* ]]; then
+ MARCH2="M${MARCH}"
+ else
+ MARCH2="${MARCH/V/CPU}"
+ fi
+
scripts/config -k -d CONFIG_GENERIC_CPU
scripts/config -k -e CONFIG_${MARCH2}
fi
diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
index 045f26b1..ee576daa 100644
--- a/linux-cachyos-eevdf/PKGBUILD
+++ b/linux-cachyos-eevdf/PKGBUILD
@@ -266,7 +266,14 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=M${MARCH}
+ MARCH2=${MARCH}
+
+ if [[ ! "$MARCH" =~ GENERIC* ]]; then
+ MARCH2="M${MARCH}"
+ else
+ MARCH2="${MARCH/V/CPU}"
+ fi
+
scripts/config -k -d CONFIG_GENERIC_CPU
scripts/config -k -e CONFIG_${MARCH2}
fi
diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
index f8bc2a63..d35a999e 100644
--- a/linux-cachyos-hardened/PKGBUILD
+++ b/linux-cachyos-hardened/PKGBUILD
@@ -266,7 +266,14 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=M${MARCH}
+ MARCH2=${MARCH}
+
+ if [[ ! "$MARCH" =~ GENERIC* ]]; then
+ MARCH2="M${MARCH}"
+ else
+ MARCH2="${MARCH/V/CPU}"
+ fi
+
scripts/config -k -d CONFIG_GENERIC_CPU
scripts/config -k -e CONFIG_${MARCH2}
fi
diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
index ae425e08..c8540270 100644
--- a/linux-cachyos-lts/PKGBUILD
+++ b/linux-cachyos-lts/PKGBUILD
@@ -290,7 +290,14 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=M${MARCH}
+ MARCH2=${MARCH}
+
+ if [[ ! "$MARCH" =~ GENERIC* ]]; then
+ MARCH2="M${MARCH}"
+ else
+ MARCH2="${MARCH/V/CPU}"
+ fi
+
scripts/config -k -d CONFIG_GENERIC_CPU
scripts/config -k -e CONFIG_${MARCH2}
fi
diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
index a1984c2e..91047206 100644
--- a/linux-cachyos-rc/PKGBUILD
+++ b/linux-cachyos-rc/PKGBUILD
@@ -266,7 +266,14 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=M${MARCH}
+ MARCH2=${MARCH}
+
+ if [[ ! "$MARCH" =~ GENERIC* ]]; then
+ MARCH2="M${MARCH}"
+ else
+ MARCH2="${MARCH/V/CPU}"
+ fi
+
scripts/config -k -d CONFIG_GENERIC_CPU
scripts/config -k -e CONFIG_${MARCH2}
fi
diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD
index 724ba35a..695d8012 100644
--- a/linux-cachyos-rt-bore/PKGBUILD
+++ b/linux-cachyos-rt-bore/PKGBUILD
@@ -266,7 +266,14 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=M${MARCH}
+ MARCH2=${MARCH}
+
+ if [[ ! "$MARCH" =~ GENERIC* ]]; then
+ MARCH2="M${MARCH}"
+ else
+ MARCH2="${MARCH/V/CPU}"
+ fi
+
scripts/config -k -d CONFIG_GENERIC_CPU
scripts/config -k -e CONFIG_${MARCH2}
fi
diff --git a/linux-cachyos-sched-ext-debug/PKGBUILD b/linux-cachyos-sched-ext-debug/PKGBUILD
index 0e136b5e..c6395237 100644
--- a/linux-cachyos-sched-ext-debug/PKGBUILD
+++ b/linux-cachyos-sched-ext-debug/PKGBUILD
@@ -266,7 +266,14 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=M${MARCH}
+ MARCH2=${MARCH}
+
+ if [[ ! "$MARCH" =~ GENERIC* ]]; then
+ MARCH2="M${MARCH}"
+ else
+ MARCH2="${MARCH/V/CPU}"
+ fi
+
scripts/config -k -d CONFIG_GENERIC_CPU
scripts/config -k -e CONFIG_${MARCH2}
fi
diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD
index 7b1fa028..d00648f6 100644
--- a/linux-cachyos-sched-ext/PKGBUILD
+++ b/linux-cachyos-sched-ext/PKGBUILD
@@ -266,7 +266,14 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=M${MARCH}
+ MARCH2=${MARCH}
+
+ if [[ ! "$MARCH" =~ GENERIC* ]]; then
+ MARCH2="M${MARCH}"
+ else
+ MARCH2="${MARCH/V/CPU}"
+ fi
+
scripts/config -k -d CONFIG_GENERIC_CPU
scripts/config -k -e CONFIG_${MARCH2}
fi
diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD
index 72fda0ed..7597e958 100644
--- a/linux-cachyos-server/PKGBUILD
+++ b/linux-cachyos-server/PKGBUILD
@@ -266,7 +266,14 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=M${MARCH}
+ MARCH2=${MARCH}
+
+ if [[ ! "$MARCH" =~ GENERIC* ]]; then
+ MARCH2="M${MARCH}"
+ else
+ MARCH2="${MARCH/V/CPU}"
+ fi
+
scripts/config -k -d CONFIG_GENERIC_CPU
scripts/config -k -e CONFIG_${MARCH2}
fi
diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
index ddced32a..745a5e49 100644
--- a/linux-cachyos/PKGBUILD
+++ b/linux-cachyos/PKGBUILD
@@ -266,7 +266,14 @@ prepare() {
### Select CPU optimization
if [ -n "$_processor_opt" ]; then
MARCH="${_processor_opt^^}"
- MARCH2=M${MARCH}
+ MARCH2=${MARCH}
+
+ if [[ ! "$MARCH" =~ GENERIC* ]]; then
+ MARCH2="M${MARCH}"
+ else
+ MARCH2="${MARCH/V/CPU}"
+ fi
+
scripts/config -k -d CONFIG_GENERIC_CPU
scripts/config -k -e CONFIG_${MARCH2}
fi