1
- From 8332da8a6f04ef2c1aea698cf78d96008afb58ff Mon Sep 17 00:00:00 2001
1
+ From 1b0a2c0dfcd5b7190adb6e491851bf91f3bc014f Mon Sep 17 00:00:00 2001
2
2
From: Nathan Chancellor <
[email protected] >
3
3
Date: Sat, 5 Jan 2019 11:51:39 -0700
4
4
Subject: [PATCH 1/2] DO-NOT-UPSTREAM: x86: Revert two commits that break the
@@ -162,7 +162,7 @@ index 1954dd5552a2..fd49f32afdbc 100644
162
162
2.21.0
163
163
164
164
165
- From e8e8b6a3501be642a50675f7441d30c6a16bc86f Mon Sep 17 00:00:00 2001
165
+ From f55f98b98f9ea0a6abd0c5c89ccef9bedb5f926a Mon Sep 17 00:00:00 2001
166
166
From: Nathan Chancellor <
[email protected] >
167
167
Date: Tue, 25 Sep 2018 13:32:33 -0700
168
168
Subject: [PATCH 2/2] DO-NOT-UPSTREAM: x86: Avoid warnings/errors due to lack
186
186
3 files changed, 12 insertions(+), 4 deletions(-)
187
187
188
188
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
189
- index 2d8b9d8ca4f8..2329b1af60f9 100644
189
+ index a587805c6687..2f1105de56cf 100644
190
190
--- a/arch/x86/Makefile
191
191
+++ b/arch/x86/Makefile
192
- @@ -223 ,6 +223 ,11 @@ ifdef CONFIG_RETPOLINE
193
- KBUILD_CFLAGS += $(call cc-option,--param=case-values-threshold=20)
192
+ @@ -227 ,6 +227 ,11 @@ ifdef CONFIG_RETPOLINE
193
+ endif
194
194
endif
195
195
196
196
+ # Avoid warnings in arch/x86/include/asm/cpufeature.h when building with Clang
@@ -201,7 +201,7 @@ index 2d8b9d8ca4f8..2329b1af60f9 100644
201
201
archscripts: scripts_basic
202
202
$(Q)$(MAKE) $(build)=arch/x86/tools relocs
203
203
204
- @@ -293 ,10 +298 ,6 @@ vdso_install:
204
+ @@ -297 ,10 +302 ,6 @@ vdso_install:
205
205
206
206
archprepare: checkbin
207
207
checkbin:
0 commit comments