drop arm-ftrace-fix-be-text-poking.patch from everywhere.

diff --git a/queue-4.14/arm-ftrace-fix-be-text-poking.patch b/queue-4.14/arm-ftrace-fix-be-text-poking.patch
deleted file mode 100644 (file)
index b8a93b1..0000000
--- a/queue-4.14/arm-ftrace-fix-be-text-poking.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 5c01d47e9e5bde52f25b9da7015f906662b7f6a5 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 7 Feb 2020 12:57:36 +0100
-Subject: arm/ftrace: Fix BE text poking
-
-From: Peter Zijlstra <peterz@infradead.org>
-
-[ Upstream commit be993e44badc448add6a18d6f12b20615692c4c3 ]
-
-The __patch_text() function already applies __opcode_to_mem_*(), so
-when __opcode_to_mem_*() is not the identity (BE*), it is applied
-twice, wrecking the instruction.
-
-Fixes: 42e51f187f86 ("arm/ftrace: Use __patch_text()")
-Reported-by: Dmitry Osipenko <digetx@gmail.com>
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Tested-by: Dmitry Osipenko <digetx@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/kernel/ftrace.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
-index 5617932a83dfa..26b7321bb2152 100644
---- a/arch/arm/kernel/ftrace.c
-+++ b/arch/arm/kernel/ftrace.c
-@@ -106,13 +106,10 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old,
- {
-       unsigned long replaced;
- 
--      if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) {
-+      if (IS_ENABLED(CONFIG_THUMB2_KERNEL))
-               old = __opcode_to_mem_thumb32(old);
--              new = __opcode_to_mem_thumb32(new);
--      } else {
-+      else
-               old = __opcode_to_mem_arm(old);
--              new = __opcode_to_mem_arm(new);
--      }
- 
-       if (validate) {
-               if (probe_kernel_read(&replaced, (void *)pc, MCOUNT_INSN_SIZE))
--- 
-2.20.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 8d876c60727c68e5adf417750992d5450ed7f25d..21c8b1f23e0bf218f38ea54ac0e208c192b6c0d2 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -10,7 +10,6 @@ mac80211-consider-more-elements-in-parsing-crc.patch
 cfg80211-check-wiphy-driver-existence-for-drvinfo-re.patch
 qmi_wwan-re-add-dw5821e-pre-production-variant.patch
 qmi_wwan-unconditionally-reject-2-ep-interfaces.patch
-arm-ftrace-fix-be-text-poking.patch
 net-ena-fix-potential-crash-when-rxfh-key-is-null.patch
 net-ena-fix-uses-of-round_jiffies.patch
 net-ena-add-missing-ethtool-tx-timestamping-indicati.patch

diff --git a/queue-4.19/arm-ftrace-fix-be-text-poking.patch b/queue-4.19/arm-ftrace-fix-be-text-poking.patch
deleted file mode 100644 (file)
index 98db8f4..0000000
--- a/queue-4.19/arm-ftrace-fix-be-text-poking.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 12be401a2eb29c1dfa5a24dadaf598c9d605936e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 7 Feb 2020 12:57:36 +0100
-Subject: arm/ftrace: Fix BE text poking
-
-From: Peter Zijlstra <peterz@infradead.org>
-
-[ Upstream commit be993e44badc448add6a18d6f12b20615692c4c3 ]
-
-The __patch_text() function already applies __opcode_to_mem_*(), so
-when __opcode_to_mem_*() is not the identity (BE*), it is applied
-twice, wrecking the instruction.
-
-Fixes: 42e51f187f86 ("arm/ftrace: Use __patch_text()")
-Reported-by: Dmitry Osipenko <digetx@gmail.com>
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Tested-by: Dmitry Osipenko <digetx@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/kernel/ftrace.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
-index ee673c09aa6c0..dd0215fb6fe23 100644
---- a/arch/arm/kernel/ftrace.c
-+++ b/arch/arm/kernel/ftrace.c
-@@ -106,13 +106,10 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old,
- {
-       unsigned long replaced;
- 
--      if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) {
-+      if (IS_ENABLED(CONFIG_THUMB2_KERNEL))
-               old = __opcode_to_mem_thumb32(old);
--              new = __opcode_to_mem_thumb32(new);
--      } else {
-+      else
-               old = __opcode_to_mem_arm(old);
--              new = __opcode_to_mem_arm(new);
--      }
- 
-       if (validate) {
-               if (probe_kernel_read(&replaced, (void *)pc, MCOUNT_INSN_SIZE))
--- 
-2.20.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index e8162639a41e160b4950e6740acbc96cfb1624b7..b3933f964a49dd73e363f1a91a718f28072d6366 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -8,7 +8,6 @@ cfg80211-check-wiphy-driver-existence-for-drvinfo-re.patch
 s390-zcrypt-fix-card-and-queue-total-counter-wrap.patch
 qmi_wwan-re-add-dw5821e-pre-production-variant.patch
 qmi_wwan-unconditionally-reject-2-ep-interfaces.patch
-arm-ftrace-fix-be-text-poking.patch
 arm-dts-sti-fixup-sound-frame-inversion-for-stihxxx-.patch
 soc-tegra-fuse-fix-build-with-tegra194-configuration.patch
 net-ena-fix-potential-crash-when-rxfh-key-is-null.patch

diff --git a/queue-4.4/arm-ftrace-fix-be-text-poking.patch b/queue-4.4/arm-ftrace-fix-be-text-poking.patch
deleted file mode 100644 (file)
index c99aa14..0000000
--- a/queue-4.4/arm-ftrace-fix-be-text-poking.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 8c9c4da2c156ee1fed4e685d42609b510019e269 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 7 Feb 2020 12:57:36 +0100
-Subject: arm/ftrace: Fix BE text poking
-
-From: Peter Zijlstra <peterz@infradead.org>
-
-[ Upstream commit be993e44badc448add6a18d6f12b20615692c4c3 ]
-
-The __patch_text() function already applies __opcode_to_mem_*(), so
-when __opcode_to_mem_*() is not the identity (BE*), it is applied
-twice, wrecking the instruction.
-
-Fixes: 42e51f187f86 ("arm/ftrace: Use __patch_text()")
-Reported-by: Dmitry Osipenko <digetx@gmail.com>
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Tested-by: Dmitry Osipenko <digetx@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/kernel/ftrace.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
-index faa9a905826ee..7982409e5c27f 100644
---- a/arch/arm/kernel/ftrace.c
-+++ b/arch/arm/kernel/ftrace.c
-@@ -105,13 +105,10 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old,
- {
-       unsigned long replaced;
- 
--      if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) {
-+      if (IS_ENABLED(CONFIG_THUMB2_KERNEL))
-               old = __opcode_to_mem_thumb32(old);
--              new = __opcode_to_mem_thumb32(new);
--      } else {
-+      else
-               old = __opcode_to_mem_arm(old);
--              new = __opcode_to_mem_arm(new);
--      }
- 
-       if (validate) {
-               if (probe_kernel_read(&replaced, (void *)pc, MCOUNT_INSN_SIZE))
--- 
-2.20.1
-

diff --git a/queue-4.4/series b/queue-4.4/series
index b99975e8aa580edfdc2455b5649c7626914baf9e..a92d443e59fd431ed7cc0d717ba3b8c2ebb4ebef 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -5,7 +5,6 @@ ext4-fix-potential-race-between-s_group_info-online-.patch
 ipmi-ssif-handle-a-possible-null-pointer-reference.patch
 mac80211-consider-more-elements-in-parsing-crc.patch
 cfg80211-check-wiphy-driver-existence-for-drvinfo-re.patch
-arm-ftrace-fix-be-text-poking.patch
 cifs-fix-mode-output-in-debugging-statements.patch
 cfg80211-add-missing-policy-for-nl80211_attr_status_.patch
 sysrq-restore-original-console_loglevel-when-sysrq-disabled.patch

diff --git a/queue-4.9/arm-ftrace-fix-be-text-poking.patch b/queue-4.9/arm-ftrace-fix-be-text-poking.patch
deleted file mode 100644 (file)
index 5edf426..0000000
--- a/queue-4.9/arm-ftrace-fix-be-text-poking.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 66890fa0013d7b4fa4ea585b1916e91ceebf7bb3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 7 Feb 2020 12:57:36 +0100
-Subject: arm/ftrace: Fix BE text poking
-
-From: Peter Zijlstra <peterz@infradead.org>
-
-[ Upstream commit be993e44badc448add6a18d6f12b20615692c4c3 ]
-
-The __patch_text() function already applies __opcode_to_mem_*(), so
-when __opcode_to_mem_*() is not the identity (BE*), it is applied
-twice, wrecking the instruction.
-
-Fixes: 42e51f187f86 ("arm/ftrace: Use __patch_text()")
-Reported-by: Dmitry Osipenko <digetx@gmail.com>
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Tested-by: Dmitry Osipenko <digetx@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/kernel/ftrace.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
-index 414e60ed02573..58a01083b0415 100644
---- a/arch/arm/kernel/ftrace.c
-+++ b/arch/arm/kernel/ftrace.c
-@@ -105,13 +105,10 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old,
- {
-       unsigned long replaced;
- 
--      if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) {
-+      if (IS_ENABLED(CONFIG_THUMB2_KERNEL))
-               old = __opcode_to_mem_thumb32(old);
--              new = __opcode_to_mem_thumb32(new);
--      } else {
-+      else
-               old = __opcode_to_mem_arm(old);
--              new = __opcode_to_mem_arm(new);
--      }
- 
-       if (validate) {
-               if (probe_kernel_read(&replaced, (void *)pc, MCOUNT_INSN_SIZE))
--- 
-2.20.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 79403e20b1033c419cdf063ecb258d48fca1c8e9..135292d2defa9e1483dbca7d5b54d819163d8d9c 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -7,7 +7,6 @@ drm-msm-set-dma-maximum-segment-size-for-mdss.patch
 mac80211-consider-more-elements-in-parsing-crc.patch
 cfg80211-check-wiphy-driver-existence-for-drvinfo-re.patch
 qmi_wwan-re-add-dw5821e-pre-production-variant.patch
-arm-ftrace-fix-be-text-poking.patch
 net-ena-fix-potential-crash-when-rxfh-key-is-null.patch
 net-ena-add-missing-ethtool-tx-timestamping-indicati.patch
 net-ena-fix-incorrect-default-rss-key.patch

diff --git a/queue-5.4/arm-ftrace-fix-be-text-poking.patch b/queue-5.4/arm-ftrace-fix-be-text-poking.patch
deleted file mode 100644 (file)
index 1d43354..0000000
--- a/queue-5.4/arm-ftrace-fix-be-text-poking.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From e4a84378c32f4e6ea1d64315410c82f144fb89a2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 7 Feb 2020 12:57:36 +0100
-Subject: arm/ftrace: Fix BE text poking
-
-From: Peter Zijlstra <peterz@infradead.org>
-
-[ Upstream commit be993e44badc448add6a18d6f12b20615692c4c3 ]
-
-The __patch_text() function already applies __opcode_to_mem_*(), so
-when __opcode_to_mem_*() is not the identity (BE*), it is applied
-twice, wrecking the instruction.
-
-Fixes: 42e51f187f86 ("arm/ftrace: Use __patch_text()")
-Reported-by: Dmitry Osipenko <digetx@gmail.com>
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Tested-by: Dmitry Osipenko <digetx@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/kernel/ftrace.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
-index bda949fd84e8b..93caf757f1d5d 100644
---- a/arch/arm/kernel/ftrace.c
-+++ b/arch/arm/kernel/ftrace.c
-@@ -81,13 +81,10 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old,
- {
-       unsigned long replaced;
- 
--      if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) {
-+      if (IS_ENABLED(CONFIG_THUMB2_KERNEL))
-               old = __opcode_to_mem_thumb32(old);
--              new = __opcode_to_mem_thumb32(new);
--      } else {
-+      else
-               old = __opcode_to_mem_arm(old);
--              new = __opcode_to_mem_arm(new);
--      }
- 
-       if (validate) {
-               if (probe_kernel_read(&replaced, (void *)pc, MCOUNT_INSN_SIZE))
--- 
-2.20.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 565c272397fbd15420721283276eef1fdaa261c6..1c69f8af45db560c3b1f39acdda1f4534558b9ef 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -32,7 +32,6 @@ qmi_wwan-re-add-dw5821e-pre-production-variant.patch
 qmi_wwan-unconditionally-reject-2-ep-interfaces.patch
 nfsv4-fix-races-between-open-and-dentry-revalidation.patch
 perf-smmuv3-use-platform_get_irq_optional-for-wired-.patch
-arm-ftrace-fix-be-text-poking.patch
 perf-x86-intel-add-elkhart-lake-support.patch
 perf-x86-cstate-add-tremont-support.patch
 perf-x86-msr-add-tremont-support.patch

diff --git a/queue-5.5/arm-ftrace-fix-be-text-poking.patch b/queue-5.5/arm-ftrace-fix-be-text-poking.patch
deleted file mode 100644 (file)
index 7598d9d..0000000
--- a/queue-5.5/arm-ftrace-fix-be-text-poking.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 912cb6f91c90045342a0972d31f1eb8fb72858ef Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 7 Feb 2020 12:57:36 +0100
-Subject: arm/ftrace: Fix BE text poking
-
-From: Peter Zijlstra <peterz@infradead.org>
-
-[ Upstream commit be993e44badc448add6a18d6f12b20615692c4c3 ]
-
-The __patch_text() function already applies __opcode_to_mem_*(), so
-when __opcode_to_mem_*() is not the identity (BE*), it is applied
-twice, wrecking the instruction.
-
-Fixes: 42e51f187f86 ("arm/ftrace: Use __patch_text()")
-Reported-by: Dmitry Osipenko <digetx@gmail.com>
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Tested-by: Dmitry Osipenko <digetx@gmail.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/kernel/ftrace.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
-index bda949fd84e8b..93caf757f1d5d 100644
---- a/arch/arm/kernel/ftrace.c
-+++ b/arch/arm/kernel/ftrace.c
-@@ -81,13 +81,10 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old,
- {
-       unsigned long replaced;
- 
--      if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) {
-+      if (IS_ENABLED(CONFIG_THUMB2_KERNEL))
-               old = __opcode_to_mem_thumb32(old);
--              new = __opcode_to_mem_thumb32(new);
--      } else {
-+      else
-               old = __opcode_to_mem_arm(old);
--              new = __opcode_to_mem_arm(new);
--      }
- 
-       if (validate) {
-               if (probe_kernel_read(&replaced, (void *)pc, MCOUNT_INSN_SIZE))
--- 
-2.20.1
-

diff --git a/queue-5.5/series b/queue-5.5/series
index a2db600fc9b5afb43b0d0ae3cb3c49072cfecf09..fd938eb49ef8cb69062ec75569f3de1df4d92532 100644 (file)
--- a/queue-5.5/series
+++ b/queue-5.5/series
@@ -36,7 +36,6 @@ qmi_wwan-re-add-dw5821e-pre-production-variant.patch
 qmi_wwan-unconditionally-reject-2-ep-interfaces.patch
 nfsv4-fix-races-between-open-and-dentry-revalidation.patch
 perf-smmuv3-use-platform_get_irq_optional-for-wired-.patch
-arm-ftrace-fix-be-text-poking.patch
 perf-x86-intel-add-elkhart-lake-support.patch
 perf-x86-cstate-add-tremont-support.patch
 perf-x86-msr-add-tremont-support.patch