From ac5ceec882898aa46353794a7c8b645b9ec5ae19 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Sun, 22 Sep 2024 13:42:46 +0200
Subject: [PATCH] Revert "config: Enable RUST"

There's some issues with mitigation that's not supported by Rust yet
causing objtool to spew warnings. Disable RUST again as (currently) it
adds little value to a generic distribution kernel.

This reverts commit 14fad3df4488776debb20a3abdd9ae98efaa9df5. Also keep
GCC_PLUGINS disabled as we don't make use of them.

Fixes: https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/issues/82
---
 .SRCINFO | 7 ++-----
 PKGBUILD | 7 ++-----
 config   | 9 ---------
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 500d272..778eab8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,9 +12,6 @@ pkgbase = linux
 	makedepends = pahole
 	makedepends = perl
 	makedepends = python
-	makedepends = rust
-	makedepends = rust-bindgen
-	makedepends = rust-src
 	makedepends = tar
 	makedepends = xz
 	makedepends = graphviz
@@ -36,12 +33,12 @@ pkgbase = linux
 	sha256sums = SKIP
 	sha256sums = ade8767de6e946acf29d9294c45f05d71b94f6e162317b6466d85cd04f5cf6f7
 	sha256sums = SKIP
-	sha256sums = bb5b077af2b1b01440835eec1ac4443fdd483a21505d2eb91d58254b2b49784b
+	sha256sums = 5e9788160ed19f177ebb556e0620634ba5cebb2d9c9f0e6c5997d4f5ddf4eaf3
 	b2sums = e7750c0878d71a56a0ce52d4c4c912199dad5bf5e2e8f872585a6494afbb37cbd852e612a6858936d2dc9b7776a3933818f540db408d57e90d18ea5249bba7ab
 	b2sums = SKIP
 	b2sums = 09ecff50d0efe2ead6bcdbac9f47bba37c74eb5c0b2cdf00ee1624af9e633e3be8058a05373774b2a4e7b7c99df1f4cbac4c9b120f859b656fbb013fca173ab4
 	b2sums = SKIP
-	b2sums = 0fff4286ddce5b66453a96129aa0682fd01e488d199c864564a7a77735fed4ce948056198ad83719e71c45054485305fde2c46eaad2f2f3abed10bc50d4e59e6
+	b2sums = 630e600d07483642846e314f0d1c81e11356a533477f5718d6b53418562e2ab98e07097de7ec41701bcf75ef4d72ea2fce6eadb896422563ca14d74f6c77f7cc
 
 pkgname = linux
 	pkgdesc = The Linux kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 4858687..f9f8aaf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,9 +15,6 @@ makedepends=(
   pahole
   perl
   python
-  rust
-  rust-bindgen
-  rust-src
   tar
   xz
 
@@ -49,12 +46,12 @@ sha256sums=('55d2c6c025ebc27810c748d66325dd5bc601e8d32f8581d9e77673529bdacb2e'
             'SKIP'
             'ade8767de6e946acf29d9294c45f05d71b94f6e162317b6466d85cd04f5cf6f7'
             'SKIP'
-            'bb5b077af2b1b01440835eec1ac4443fdd483a21505d2eb91d58254b2b49784b')
+            '5e9788160ed19f177ebb556e0620634ba5cebb2d9c9f0e6c5997d4f5ddf4eaf3')
 b2sums=('e7750c0878d71a56a0ce52d4c4c912199dad5bf5e2e8f872585a6494afbb37cbd852e612a6858936d2dc9b7776a3933818f540db408d57e90d18ea5249bba7ab'
         'SKIP'
         '09ecff50d0efe2ead6bcdbac9f47bba37c74eb5c0b2cdf00ee1624af9e633e3be8058a05373774b2a4e7b7c99df1f4cbac4c9b120f859b656fbb013fca173ab4'
         'SKIP'
-        '0fff4286ddce5b66453a96129aa0682fd01e488d199c864564a7a77735fed4ce948056198ad83719e71c45054485305fde2c46eaad2f2f3abed10bc50d4e59e6')
+        '630e600d07483642846e314f0d1c81e11356a533477f5718d6b53418562e2ab98e07097de7ec41701bcf75ef4d72ea2fce6eadb896422563ca14d74f6c77f7cc')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
diff --git a/config b/config
index 5d86dc9..f12e3df 100644
--- a/config
+++ b/config
@@ -11,7 +11,6 @@ CONFIG_AS_VERSION=24300
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24300
 CONFIG_LLD_VERSION=0
-CONFIG_RUST_IS_AVAILABLE=y
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -316,9 +315,6 @@ CONFIG_PERF_EVENTS=y
 
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
-CONFIG_RUST=y
-CONFIG_RUSTC_VERSION_TEXT="rustc 1.81.0 (eeb90cda1 2024-09-04)"
-CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.70.1"
 CONFIG_TRACEPOINTS=y
 
 #
@@ -2349,7 +2345,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
 CONFIG_FW_LOADER=y
 CONFIG_FW_LOADER_DEBUG=y
-# CONFIG_RUST_FW_LOADER_ABSTRACTIONS is not set
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_FW_LOADER_SYSFS=y
 CONFIG_EXTRA_FIRMWARE=""
@@ -2664,7 +2659,6 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_VIRTIO_BLK=m
-# CONFIG_BLK_DEV_RUST_NULL is not set
 CONFIG_BLK_DEV_RBD=m
 CONFIG_BLK_DEV_UBLK=m
 CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
@@ -11946,8 +11940,5 @@ CONFIG_MEMTEST=y
 #
 # Rust hacking
 #
-# CONFIG_RUST_DEBUG_ASSERTIONS is not set
-CONFIG_RUST_OVERFLOW_CHECKS=y
-# CONFIG_RUST_BUILD_ASSERT_ALLOW is not set
 # end of Rust hacking
 # end of Kernel hacking