[xen stable-4.11] x86/alternative: introduce alternative_2

[patchbot@xxxxxxx]

commit d62365801ae339f00708cd66aef7d53caea685ad
Author:     Roger Pau Monné <roger.pau@xxxxxxxxxx>
AuthorDate: Tue Jul 7 15:23:55 2020 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Jul 7 15:23:55 2020 +0200

    x86/alternative: introduce alternative_2
    
    It's based on alternative_io_2 without inputs or outputs but with an
    added memory clobber.
    
    This is part of XSA-321.
    
    Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
    master commit: 23570bce00ee6ba2139ece978ab6f03ff166e21d
    master date: 2020-07-07 14:39:25 +0200
---
 xen/include/asm-x86/alternative.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xen/include/asm-x86/alternative.h 
b/xen/include/asm-x86/alternative.h
index 619472efcb..3e608e8633 100644
--- a/xen/include/asm-x86/alternative.h
+++ b/xen/include/asm-x86/alternative.h
@@ -113,6 +113,11 @@ extern void alternative_instructions(void);
 #define alternative(oldinstr, newinstr, feature)                        \
         asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) : : : "memory")
 
+#define alternative_2(oldinstr, newinstr1, feature1, newinstr2, feature2) \
+       asm volatile (ALTERNATIVE_2(oldinstr, newinstr1, feature1,      \
+                                   newinstr2, feature2)                \
+                     : : : "memory")
+
 /*
  * Alternative inline assembly with input.
  *
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.11