From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 8 Aug 2023 19:02:52 +0000 (+0200)
Subject: fuzz cleanup
X-Git-Tag: v4.14.322~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d03562b742c42fe35efa25755ddd2fa1885a4af;p=thirdparty%2Fkernel%2Fstable-queue.git

fuzz cleanup
---

diff --git a/queue-4.14/x86-smp-use-dedicated-cache-line-for-mwait_play_dead.patch b/queue-4.14/x86-smp-use-dedicated-cache-line-for-mwait_play_dead.patch
index 14dfa357b67..7c95f5ea959 100644
--- a/queue-4.14/x86-smp-use-dedicated-cache-line-for-mwait_play_dead.patch
+++ b/queue-4.14/x86-smp-use-dedicated-cache-line-for-mwait_play_dead.patch
@@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  /* Logical package management. We might want to allocate that dynamically */
  static int *physical_to_logical_pkg __read_mostly;
  static unsigned long *physical_package_map __read_mostly;;
-@@ -1637,10 +1648,10 @@ static bool wakeup_cpu0(void)
+@@ -1638,10 +1649,10 @@ static bool wakeup_cpu0(void)
   */
  static inline void mwait_play_dead(void)
  {
@@ -63,7 +63,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	int i;
  
  	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
-@@ -1674,13 +1685,6 @@ static inline void mwait_play_dead(void)
+@@ -1675,13 +1686,6 @@ static inline void mwait_play_dead(void)
  			(highest_subcstate - 1);
  	}
  
@@ -77,7 +77,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	wbinvd();
  
  	while (1) {
-@@ -1692,9 +1696,9 @@ static inline void mwait_play_dead(void)
+@@ -1693,9 +1697,9 @@ static inline void mwait_play_dead(void)
  		 * case where we return around the loop.
  		 */
  		mb();
diff --git a/queue-4.19/x86-smp-use-dedicated-cache-line-for-mwait_play_dead.patch b/queue-4.19/x86-smp-use-dedicated-cache-line-for-mwait_play_dead.patch
index 631b2772a18..47f05f2a42b 100644
--- a/queue-4.19/x86-smp-use-dedicated-cache-line-for-mwait_play_dead.patch
+++ b/queue-4.19/x86-smp-use-dedicated-cache-line-for-mwait_play_dead.patch
@@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  /* Logical package management. We might want to allocate that dynamically */
  unsigned int __max_logical_packages __read_mostly;
  EXPORT_SYMBOL(__max_logical_packages);
-@@ -1594,10 +1605,10 @@ static bool wakeup_cpu0(void)
+@@ -1595,10 +1606,10 @@ static bool wakeup_cpu0(void)
   */
  static inline void mwait_play_dead(void)
  {
@@ -63,7 +63,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	int i;
  
  	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
-@@ -1631,13 +1642,6 @@ static inline void mwait_play_dead(void)
+@@ -1632,13 +1643,6 @@ static inline void mwait_play_dead(void)
  			(highest_subcstate - 1);
  	}
  
@@ -77,7 +77,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	wbinvd();
  
  	while (1) {
-@@ -1649,9 +1653,9 @@ static inline void mwait_play_dead(void)
+@@ -1650,9 +1654,9 @@ static inline void mwait_play_dead(void)
  		 * case where we return around the loop.
  		 */
  		mb();