| Message ID | 1469031064-23344-2-git-send-email-julien.grall@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 20 Jul 2016, Julien Grall wrote: > 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> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > 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(-) > > 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"); \ > }) > > -- > 1.9.1 >
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"); \ })
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(-)