| Message ID | 1395158001-28085-2-git-send-email-ian.campbell@citrix.com |
|---|---|
| State | Accepted |
| Commit | c0975b715bb89f0e2868e7031fc6b90e9eb7f750 |
| Headers | show |
On 03/18/2014 03:53 PM, Ian Campbell wrote: > The if in domain.c was only syntactically valid because the macro happened to > contain enclosing braces. > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Julien Grall <julien.grall@linaro.org> > --- > xen/arch/arm/domain.c | 2 +- > xen/arch/arm/traps.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c > index 0f83e81..8f91c2e 100644 > --- a/xen/arch/arm/domain.c > +++ b/xen/arch/arm/domain.c > @@ -257,7 +257,7 @@ static void continue_new_vcpu(struct vcpu *prev) > > if ( is_idle_vcpu(current) ) > reset_stack_and_jump(idle_loop); > - else if is_32bit_domain(current->domain) > + else if ( is_32bit_domain(current->domain) ) > /* check_wakeup_from_wait(); */ > reset_stack_and_jump(return_to_new_vcpu32); > else > diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c > index 563cc62..5d66bc4 100644 > --- a/xen/arch/arm/traps.c > +++ b/xen/arch/arm/traps.c > @@ -1563,12 +1563,12 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) > advance_pc(regs, hsr); > break; > case HSR_EC_CP15_32: > - if ( ! is_32bit_domain(current->domain) ) > + if ( !is_32bit_domain(current->domain) ) > goto bad_trap; > do_cp15_32(regs, hsr); > break; > case HSR_EC_CP15_64: > - if ( ! is_32bit_domain(current->domain) ) > + if ( !is_32bit_domain(current->domain) ) > goto bad_trap; > do_cp15_64(regs, hsr); > break; >
On Tue, 2014-03-18 at 16:01 +0000, Julien Grall wrote: > On 03/18/2014 03:53 PM, Ian Campbell wrote: > > The if in domain.c was only syntactically valid because the macro happened to > > contain enclosing braces. > > > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > Acked-by: Julien Grall <julien.grall@linaro.org> Thanks. Applied this and #1/2. Ian.
diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 0f83e81..8f91c2e 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -257,7 +257,7 @@ static void continue_new_vcpu(struct vcpu *prev) if ( is_idle_vcpu(current) ) reset_stack_and_jump(idle_loop); - else if is_32bit_domain(current->domain) + else if ( is_32bit_domain(current->domain) ) /* check_wakeup_from_wait(); */ reset_stack_and_jump(return_to_new_vcpu32); else diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 563cc62..5d66bc4 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1563,12 +1563,12 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs *regs) advance_pc(regs, hsr); break; case HSR_EC_CP15_32: - if ( ! is_32bit_domain(current->domain) ) + if ( !is_32bit_domain(current->domain) ) goto bad_trap; do_cp15_32(regs, hsr); break; case HSR_EC_CP15_64: - if ( ! is_32bit_domain(current->domain) ) + if ( !is_32bit_domain(current->domain) ) goto bad_trap; do_cp15_64(regs, hsr); break;
The if in domain.c was only syntactically valid because the macro happened to contain enclosing braces. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- xen/arch/arm/domain.c | 2 +- xen/arch/arm/traps.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)