Skip to content

Commit 0d83005

Browse files
committed
patches: stable: Update Hexagon constant extender patch metadata
Now that this has been merged into mainline and has a stable hash, update the patch metadata for tracking purposes. I expect this to be picked up for stable relatively quickly. Signed-off-by: Nathan Chancellor <[email protected]>
1 parent eb56331 commit 0d83005

File tree

2 files changed

+8
-26
lines changed

2 files changed

+8
-26
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
From git@z Thu Jan 1 00:00:00 1970
2-
Subject: [PATCH v2] hexagon: Disable constant extender optimization for
3-
LLVM prior to 19.1.0
1+
From aef25be35d23ec768eed08bfcf7ca3cf9685bc28 Mon Sep 17 00:00:00 2001
42
From: Nathan Chancellor <[email protected]>
53
Date: Thu, 21 Nov 2024 11:22:18 -0700
6-
Message-Id: <20241121-hexagon-disable-constant-expander-pass-v2-1-1a92e9afb0f4@kernel.org>
7-
MIME-Version: 1.0
8-
Content-Type: text/plain; charset="utf-8"
9-
Content-Transfer-Encoding: 7bit
4+
Subject: hexagon: Disable constant extender optimization for LLVM prior to
5+
19.1.0
106

117
The Hexagon-specific constant extender optimization in LLVM may crash on
128
Linux kernel code [1], such as fs/bcache/btree_io.c after
@@ -32,24 +28,16 @@ Link: https://github.com/llvm/llvm-project/issues/99714 [1]
3228
Link: https://github.com/llvm/llvm-project/commit/68df06a0b2998765cb0a41353fcf0919bbf57ddb [2]
3329
Link: https://github.com/llvm/llvm-project/commit/2ab8d93061581edad3501561722ebd5632d73892 [3]
3430
Reviewed-by: Brian Cain <[email protected]>
35-
Link: https://lore.kernel.org/r/20241121-hexagon-disable-constant-expander-pass-v2-1-1a92e9afb0f4@kernel.org
3631
Signed-off-by: Nathan Chancellor <[email protected]>
32+
Signed-off-by: Linus Torvalds <[email protected]>
3733
---
38-
Andrew, can you please take this for 6.13? Our CI continues to hit this.
39-
40-
Changes in v2:
41-
- Rebase on 6.12 to make sure it is still applicable
42-
- Name exact bcachefs commit that introduces crash now that it is
43-
merged
44-
- Add 'Cc: stable' as this is now visible in a stable release
45-
- Carry forward Brian's reviewed-by
46-
- Link to v1: https://lore.kernel.org/r/20240819-hexagon-disable-constant-expander-pass-v1-1-36a734e9527d@kernel.org
34+
Link: https://git.kernel.org/linus/aef25be35d23ec768eed08bfcf7ca3cf9685bc28
4735
---
4836
arch/hexagon/Makefile | 6 ++++++
4937
1 file changed, 6 insertions(+)
5038

5139
diff --git a/arch/hexagon/Makefile b/arch/hexagon/Makefile
52-
index 92d005958dfb232d48a4ca843b46262a84a08eb4..ff172cbe5881a074f9d9430c37071992a4c8beac 100644
40+
index 92d005958dfb23..ff172cbe5881a0 100644
5341
--- a/arch/hexagon/Makefile
5442
+++ b/arch/hexagon/Makefile
5543
@@ -32,3 +32,9 @@ KBUILD_LDFLAGS += $(ldflags-y)
@@ -62,12 +50,6 @@ index 92d005958dfb232d48a4ca843b46262a84a08eb4..ff172cbe5881a074f9d9430c37071992
6250
+ifneq ($(call clang-min-version, 190100),y)
6351
+KBUILD_CFLAGS += -mllvm -hexagon-cext=false
6452
+endif
65-
66-
---
67-
base-commit: adc218676eef25575469234709c2d87185ca223a
68-
change-id: 20240802-hexagon-disable-constant-expander-pass-8b6b61db6afc
69-
70-
Best regards,
7153
--
72-
Nathan Chancellor <[email protected]>
54+
cgit 1.2.3-korg
7355

patches/stable/series

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch
2-
v2_20241121_nathan_hexagon_disable_constant_extender_optimization_for_llvm_prior_to_19_1_0.patch
2+
aef25be35d23ec768eed08bfcf7ca3cf9685bc28.patch

0 commit comments

Comments
 (0)