[Xen-devel,01/22] xen/arm: system: Use the correct parameter name in local_irq_restore

Message ID 1469031064-23344-2-git-send-email-julien.grall@arm.com
State New
Headers show

Commit Message

Julien Grall July 20, 2016, 4:10 p.m.
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@arm.com>

---
    This patch is candidate to be backported up to Xen 4.5.
---
 xen/include/asm-arm/arm32/system.h | 2 +-
 xen/include/asm-arm/arm64/system.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

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");                                             \
 })