From: Jan Beulich <JBeulich@suse.com>
Date: Tue, 13 Mar 2018 14:14:51 +0000 (-0600)
Subject: x86: fix OLDINSTR_2()
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~274
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f809b61a0af2a659aef27db8d2bb1bb415b8c5e3;p=xen.git

x86: fix OLDINSTR_2()

Its as_max() invocation was wrongly parenthesized.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/include/asm-x86/alternative.h b/xen/include/asm-x86/alternative.h
index 480336860a..619472efcb 100644
--- a/xen/include/asm-x86/alternative.h
+++ b/xen/include/asm-x86/alternative.h
@@ -54,8 +54,8 @@ extern void alternative_instructions(void);
 
 #define OLDINSTR_2(oldinstr, n1, n2)                             \
     OLDINSTR(oldinstr,                                           \
-             as_max((alt_repl_len(n1),                           \
-                     alt_repl_len(n2)) "-" alt_orig_len))
+             as_max(alt_repl_len(n1),                            \
+                    alt_repl_len(n2)) "-" alt_orig_len)
 
 #define ALTINSTR_ENTRY(feature, num)                                    \
         " .long .LXEN%=_orig_s - .\n"             /* label           */ \