Drop arm64-lse-make-arm64_lse_atomics-depend-on-jump_labe.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/arm64-lse-make-arm64_lse_atomics-depend-on-jump_labe.patch b/queue-4.19/arm64-lse-make-arm64_lse_atomics-depend-on-jump_labe.patch
deleted file mode 100644 (file)
index d4e065b..0000000
--- a/queue-4.19/arm64-lse-make-arm64_lse_atomics-depend-on-jump_labe.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From d7c6dbdbbdb3a71233fd3487667dcd41526b826a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 29 Aug 2019 11:52:47 +0100
-Subject: arm64: lse: Make ARM64_LSE_ATOMICS depend on JUMP_LABEL
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Will Deacon <will@kernel.org>
-
-[ Upstream commit b32baf91f60fb9c7010bff87e68132f2ce31d9a8 ]
-
-Support for LSE atomic instructions (CONFIG_ARM64_LSE_ATOMICS) relies on
-a static key to select between the legacy LL/SC implementation which is
-available on all arm64 CPUs and the super-duper LSE implementation which
-is available on CPUs implementing v8.1 and later.
-
-Unfortunately, when building a kernel with CONFIG_JUMP_LABEL disabled
-(e.g. because the toolchain doesn't support 'asm goto'), the static key
-inside the atomics code tries to use atomics itself. This results in a
-mess of circular includes and a build failure:
-
-In file included from ./arch/arm64/include/asm/lse.h:11,
-                 from ./arch/arm64/include/asm/atomic.h:16,
-                 from ./include/linux/atomic.h:7,
-                 from ./include/asm-generic/bitops/atomic.h:5,
-                 from ./arch/arm64/include/asm/bitops.h:26,
-                 from ./include/linux/bitops.h:19,
-                 from ./include/linux/kernel.h:12,
-                 from ./include/asm-generic/bug.h:18,
-                 from ./arch/arm64/include/asm/bug.h:26,
-                 from ./include/linux/bug.h:5,
-                 from ./include/linux/page-flags.h:10,
-                 from kernel/bounds.c:10:
-./include/linux/jump_label.h: In function ‘static_key_count’:
-./include/linux/jump_label.h:254:9: error: implicit declaration of function ‘atomic_read’ [-Werror=implicit-function-declaration]
-  return atomic_read(&key->enabled);
-         ^~~~~~~~~~~
-
-[ ... more of the same ... ]
-
-Since LSE atomic instructions are not critical to the operation of the
-kernel, make them depend on JUMP_LABEL at compile time.
-
-Reviewed-by: Andrew Murray <andrew.murray@arm.com>
-Signed-off-by: Will Deacon <will@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index e3ebece79617b..36b3de45c97e1 100644
---- a/arch/arm64/Kconfig
-+++ b/arch/arm64/Kconfig
-@@ -1073,6 +1073,7 @@ config ARM64_PAN
- 
- config ARM64_LSE_ATOMICS
-       bool "Atomic instructions"
-+      depends on JUMP_LABEL
-       default y
-       help
-         As part of the Large System Extensions, ARMv8.1 introduces new
--- 
-2.20.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index e9318896e1db9893a6b25bec433c1520d5952c2c..e89acd4932f19eac7375c3c75333cf8460e231dd 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -114,7 +114,6 @@ x86-mm-pti-handle-unaligned-address-gracefully-in-pt.patch
 nvmet-fix-data-units-read-and-written-counters-in-sm.patch
 nvme-multipath-fix-ana-log-nsid-lookup-when-nsid-is-.patch
 alsa-firewire-motu-add-support-for-motu-4pre.patch
-arm64-lse-make-arm64_lse_atomics-depend-on-jump_labe.patch
 iommu-amd-silence-warnings-under-memory-pressure.patch
 libata-ahci-drop-pcs-quirk-for-denverton-and-beyond.patch
 iommu-iova-avoid-false-sharing-on-fq_timer_on.patch

diff --git a/queue-5.2/arm64-lse-make-arm64_lse_atomics-depend-on-jump_labe.patch b/queue-5.2/arm64-lse-make-arm64_lse_atomics-depend-on-jump_labe.patch
deleted file mode 100644 (file)
index 09f2096..0000000
--- a/queue-5.2/arm64-lse-make-arm64_lse_atomics-depend-on-jump_labe.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From f3543fc81fd0cb0f26c2a1aa2c390eabcfaf7e68 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 29 Aug 2019 11:52:47 +0100
-Subject: arm64: lse: Make ARM64_LSE_ATOMICS depend on JUMP_LABEL
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Will Deacon <will@kernel.org>
-
-[ Upstream commit b32baf91f60fb9c7010bff87e68132f2ce31d9a8 ]
-
-Support for LSE atomic instructions (CONFIG_ARM64_LSE_ATOMICS) relies on
-a static key to select between the legacy LL/SC implementation which is
-available on all arm64 CPUs and the super-duper LSE implementation which
-is available on CPUs implementing v8.1 and later.
-
-Unfortunately, when building a kernel with CONFIG_JUMP_LABEL disabled
-(e.g. because the toolchain doesn't support 'asm goto'), the static key
-inside the atomics code tries to use atomics itself. This results in a
-mess of circular includes and a build failure:
-
-In file included from ./arch/arm64/include/asm/lse.h:11,
-                 from ./arch/arm64/include/asm/atomic.h:16,
-                 from ./include/linux/atomic.h:7,
-                 from ./include/asm-generic/bitops/atomic.h:5,
-                 from ./arch/arm64/include/asm/bitops.h:26,
-                 from ./include/linux/bitops.h:19,
-                 from ./include/linux/kernel.h:12,
-                 from ./include/asm-generic/bug.h:18,
-                 from ./arch/arm64/include/asm/bug.h:26,
-                 from ./include/linux/bug.h:5,
-                 from ./include/linux/page-flags.h:10,
-                 from kernel/bounds.c:10:
-./include/linux/jump_label.h: In function ‘static_key_count’:
-./include/linux/jump_label.h:254:9: error: implicit declaration of function ‘atomic_read’ [-Werror=implicit-function-declaration]
-  return atomic_read(&key->enabled);
-         ^~~~~~~~~~~
-
-[ ... more of the same ... ]
-
-Since LSE atomic instructions are not critical to the operation of the
-kernel, make them depend on JUMP_LABEL at compile time.
-
-Reviewed-by: Andrew Murray <andrew.murray@arm.com>
-Signed-off-by: Will Deacon <will@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index cf5f1dafcf74b..885603e5df135 100644
---- a/arch/arm64/Kconfig
-+++ b/arch/arm64/Kconfig
-@@ -1261,6 +1261,7 @@ config ARM64_PAN
- 
- config ARM64_LSE_ATOMICS
-       bool "Atomic instructions"
-+      depends on JUMP_LABEL
-       default y
-       help
-         As part of the Large System Extensions, ARMv8.1 introduces new
--- 
-2.20.1
-

diff --git a/queue-5.2/series b/queue-5.2/series
index 28c0e6136f6ab3101d0ec45b441bbaec4469a7c0..3610f393c41829baa22d2cb343847a18db74d1e6 100644 (file)
--- a/queue-5.2/series
+++ b/queue-5.2/series
@@ -161,7 +161,6 @@ x86-mm-pti-handle-unaligned-address-gracefully-in-pt.patch
 nvmet-fix-data-units-read-and-written-counters-in-sm.patch
 nvme-multipath-fix-ana-log-nsid-lookup-when-nsid-is-.patch
 alsa-firewire-motu-add-support-for-motu-4pre.patch
-arm64-lse-make-arm64_lse_atomics-depend-on-jump_labe.patch
 iommu-amd-silence-warnings-under-memory-pressure.patch
 asoc-intel-haswell-adjust-machine-device-private-con.patch
 libata-ahci-drop-pcs-quirk-for-denverton-and-beyond.patch

diff --git a/queue-5.3/arm64-lse-make-arm64_lse_atomics-depend-on-jump_labe.patch b/queue-5.3/arm64-lse-make-arm64_lse_atomics-depend-on-jump_labe.patch
deleted file mode 100644 (file)
index 7e9e165..0000000
--- a/queue-5.3/arm64-lse-make-arm64_lse_atomics-depend-on-jump_labe.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 16983ff5bf56b86f9d83d79e5b85c2da691132aa Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 29 Aug 2019 11:52:47 +0100
-Subject: arm64: lse: Make ARM64_LSE_ATOMICS depend on JUMP_LABEL
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Will Deacon <will@kernel.org>
-
-[ Upstream commit b32baf91f60fb9c7010bff87e68132f2ce31d9a8 ]
-
-Support for LSE atomic instructions (CONFIG_ARM64_LSE_ATOMICS) relies on
-a static key to select between the legacy LL/SC implementation which is
-available on all arm64 CPUs and the super-duper LSE implementation which
-is available on CPUs implementing v8.1 and later.
-
-Unfortunately, when building a kernel with CONFIG_JUMP_LABEL disabled
-(e.g. because the toolchain doesn't support 'asm goto'), the static key
-inside the atomics code tries to use atomics itself. This results in a
-mess of circular includes and a build failure:
-
-In file included from ./arch/arm64/include/asm/lse.h:11,
-                 from ./arch/arm64/include/asm/atomic.h:16,
-                 from ./include/linux/atomic.h:7,
-                 from ./include/asm-generic/bitops/atomic.h:5,
-                 from ./arch/arm64/include/asm/bitops.h:26,
-                 from ./include/linux/bitops.h:19,
-                 from ./include/linux/kernel.h:12,
-                 from ./include/asm-generic/bug.h:18,
-                 from ./arch/arm64/include/asm/bug.h:26,
-                 from ./include/linux/bug.h:5,
-                 from ./include/linux/page-flags.h:10,
-                 from kernel/bounds.c:10:
-./include/linux/jump_label.h: In function ‘static_key_count’:
-./include/linux/jump_label.h:254:9: error: implicit declaration of function ‘atomic_read’ [-Werror=implicit-function-declaration]
-  return atomic_read(&key->enabled);
-         ^~~~~~~~~~~
-
-[ ... more of the same ... ]
-
-Since LSE atomic instructions are not critical to the operation of the
-kernel, make them depend on JUMP_LABEL at compile time.
-
-Reviewed-by: Andrew Murray <andrew.murray@arm.com>
-Signed-off-by: Will Deacon <will@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 3adcec05b1f67..27405ac94228b 100644
---- a/arch/arm64/Kconfig
-+++ b/arch/arm64/Kconfig
-@@ -1263,6 +1263,7 @@ config ARM64_PAN
- 
- config ARM64_LSE_ATOMICS
-       bool "Atomic instructions"
-+      depends on JUMP_LABEL
-       default y
-       help
-         As part of the Large System Extensions, ARMv8.1 introduces new
--- 
-2.20.1
-

diff --git a/queue-5.3/series b/queue-5.3/series
index 68ef7bbd6e01d65c03f4de0c265542eb450f2482..2583e5334ee41e474f88b62ddac1099130bd3e3c 100644 (file)
--- a/queue-5.3/series
+++ b/queue-5.3/series
@@ -179,7 +179,6 @@ x86-mm-pti-handle-unaligned-address-gracefully-in-pt.patch
 nvmet-fix-data-units-read-and-written-counters-in-sm.patch
 nvme-multipath-fix-ana-log-nsid-lookup-when-nsid-is-.patch
 alsa-firewire-motu-add-support-for-motu-4pre.patch
-arm64-lse-make-arm64_lse_atomics-depend-on-jump_labe.patch
 iommu-amd-silence-warnings-under-memory-pressure.patch
 asoc-intel-haswell-adjust-machine-device-private-con.patch
 libata-ahci-drop-pcs-quirk-for-denverton-and-beyond.patch