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 4d761679bb23f464c3ed774fe18f8b9e4e2a57ed..b3010cce6f15107b4bf10c8ca129af8a632e92a8 100644 (file)
--- 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 e161caef090f6738fd0ab54e0939db7bd7d64c58..3d26eb89b786f149d64d97e7dea787c5f543ba96 100644 (file)
--- 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 e161caef090f6738fd0ab54e0939db7bd7d64c58..3d26eb89b786f149d64d97e7dea787c5f543ba96 100644 (file)
--- 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;
  }