[Xen-changelog] [xen stable-4.6] xen/arm: system: Use the correct parameter name in local_irq_restore

[patchbot@xxxxxxx]

commit db42305a8ffda7bed7655e1aa54c54321eb48ea1
Author:     Julien Grall <julien.grall@xxxxxxx>
AuthorDate: Wed Jul 20 17:10:43 2016 +0100
Commit:     Stefano Stabellini <sstabellini@xxxxxxxxxx>
CommitDate: Mon Aug 1 18:28:26 2016 -0700

    xen/arm: system: Use the correct parameter name in local_irq_restore
    
    The parameter to store the flags is called 'x' and not 'flags'.
    Thankfully all the user of the macro is passing 'flags'.
    
    Signed-off-by: Julien Grall <julien.grall@xxxxxxx>
    Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
---
 xen/include/asm-arm/arm32/system.h | 2 +-
 xen/include/asm-arm/arm64/system.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/include/asm-arm/arm32/system.h 
b/xen/include/asm-arm/arm32/system.h
index b47b942..c617b40 100644
--- a/xen/include/asm-arm/arm32/system.h
+++ b/xen/include/asm-arm/arm32/system.h
@@ -24,7 +24,7 @@
     asm volatile (                                               \
             "msr     cpsr_c, %0      @ local_irq_restore\n"      \
             :                                                    \
-            : "r" (flags)                                        \
+            : "r" (x)                                            \
             : "memory", "cc");                                   \
 })
 
diff --git a/xen/include/asm-arm/arm64/system.h 
b/xen/include/asm-arm/arm64/system.h
index 6efced3..2e2ee21 100644
--- a/xen/include/asm-arm/arm64/system.h
+++ b/xen/include/asm-arm/arm64/system.h
@@ -40,7 +40,7 @@
     asm volatile (                                               \
         "msr    daif, %0                // local_irq_restore"    \
         :                                                        \
-        : "r" (flags)                                            \
+        : "r" (x)                                                \
         : "memory");                                             \
 })
 
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog