From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 13 Sep 2018 17:16:44 +0000 (+0200)
Subject: fix up x86-pae-use-64-bit-atomic-xchg-function-in-native_ptep_get_and_clear.patch
X-Git-Tag: v4.4.156~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94b045440991568886a01d93af6a63db63ee2574;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up x86-pae-use-64-bit-atomic-xchg-function-in-native_ptep_get_and_clear.patch
---

diff --git a/queue-4.14/x86-pae-use-64-bit-atomic-xchg-function-in-native_ptep_get_and_clear.patch b/queue-4.14/x86-pae-use-64-bit-atomic-xchg-function-in-native_ptep_get_and_clear.patch
index 4d761679bb2..b3010cce6f1 100644
--- a/queue-4.14/x86-pae-use-64-bit-atomic-xchg-function-in-native_ptep_get_and_clear.patch
+++ b/queue-4.14/x86-pae-use-64-bit-atomic-xchg-function-in-native_ptep_get_and_clear.patch
@@ -31,6 +31,10 @@ Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
 Reviewed-by: Jan Beulich <jbeulich@suse.com>
 Tested-by: Jason Andryuk <jandryuk@gmail.com>
 Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
+[ Atomic operations gained an arch_ prefix in 8bf705d13039
+("locking/atomic/x86: Switch atomic.h to use atomic-instrumented.h") so
+s/arch_atomic64_xchg/atomic64_xchg/ for backport.]
+Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
@@ -56,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -	res.pte_low = xchg(&ptep->pte_low, 0);
 -	res.pte_high = ptep->pte_high;
 -	ptep->pte_high = 0;
-+	res.pte = (pteval_t)arch_atomic64_xchg((atomic64_t *)ptep, 0);
++	res.pte = (pteval_t)atomic64_xchg((atomic64_t *)ptep, 0);
  
  	return res;
  }
diff --git a/queue-4.4/x86-pae-use-64-bit-atomic-xchg-function-in-native_ptep_get_and_clear.patch b/queue-4.4/x86-pae-use-64-bit-atomic-xchg-function-in-native_ptep_get_and_clear.patch
index e161caef090..3d26eb89b78 100644
--- a/queue-4.4/x86-pae-use-64-bit-atomic-xchg-function-in-native_ptep_get_and_clear.patch
+++ b/queue-4.4/x86-pae-use-64-bit-atomic-xchg-function-in-native_ptep_get_and_clear.patch
@@ -31,6 +31,10 @@ Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
 Reviewed-by: Jan Beulich <jbeulich@suse.com>
 Tested-by: Jason Andryuk <jandryuk@gmail.com>
 Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
+[ Atomic operations gained an arch_ prefix in 8bf705d13039
+("locking/atomic/x86: Switch atomic.h to use atomic-instrumented.h") so
+s/arch_atomic64_xchg/atomic64_xchg/ for backport.]
+Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
@@ -56,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -	res.pte_low = xchg(&ptep->pte_low, 0);
 -	res.pte_high = ptep->pte_high;
 -	ptep->pte_high = 0;
-+	res.pte = (pteval_t)arch_atomic64_xchg((atomic64_t *)ptep, 0);
++	res.pte = (pteval_t)atomic64_xchg((atomic64_t *)ptep, 0);
  
  	return res;
  }
diff --git a/queue-4.9/x86-pae-use-64-bit-atomic-xchg-function-in-native_ptep_get_and_clear.patch b/queue-4.9/x86-pae-use-64-bit-atomic-xchg-function-in-native_ptep_get_and_clear.patch
index e161caef090..3d26eb89b78 100644
--- a/queue-4.9/x86-pae-use-64-bit-atomic-xchg-function-in-native_ptep_get_and_clear.patch
+++ b/queue-4.9/x86-pae-use-64-bit-atomic-xchg-function-in-native_ptep_get_and_clear.patch
@@ -31,6 +31,10 @@ Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
 Reviewed-by: Jan Beulich <jbeulich@suse.com>
 Tested-by: Jason Andryuk <jandryuk@gmail.com>
 Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
+[ Atomic operations gained an arch_ prefix in 8bf705d13039
+("locking/atomic/x86: Switch atomic.h to use atomic-instrumented.h") so
+s/arch_atomic64_xchg/atomic64_xchg/ for backport.]
+Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
@@ -56,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -	res.pte_low = xchg(&ptep->pte_low, 0);
 -	res.pte_high = ptep->pte_high;
 -	ptep->pte_high = 0;
-+	res.pte = (pteval_t)arch_atomic64_xchg((atomic64_t *)ptep, 0);
++	res.pte = (pteval_t)atomic64_xchg((atomic64_t *)ptep, 0);
  
  	return res;
  }