Message ID | 1500980060-22687-1-git-send-email-andrew.cooper3@citrix.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi Andrew, On 25/07/17 11:54, Andrew Cooper wrote: > No functional change. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Acked-by: Julien Grall <julien.grall@arm.com> Cheers, > --- > CC: George Dunlap <George.Dunlap@eu.citrix.com> > CC: Ian Jackson <ian.jackson@eu.citrix.com> > CC: Jan Beulich <JBeulich@suse.com> > CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > CC: Stefano Stabellini <sstabellini@kernel.org> > CC: Julien Grall <julien.grall@arm.com> > CC: Tim Deegan <tim@xen.org> > CC: Wei Liu <wei.liu2@citrix.com> > --- > xen/arch/arm/mm.c | 2 +- > xen/arch/x86/hvm/rtc.c | 6 +++--- > xen/common/domctl.c | 2 +- > xen/common/schedule.c | 2 +- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c > index 98260f6..a810a05 100644 > --- a/xen/arch/arm/mm.c > +++ b/xen/arch/arm/mm.c > @@ -278,7 +278,7 @@ static inline lpae_t mfn_to_xen_entry(mfn_t mfn, unsigned attr) > .contig = 0, /* Assume non-contiguous */ > .xn = 1, /* No need to execute outside .text */ > .avail = 0, /* Reference count for domheap mapping */ > - }};; > + }}; > /* > * Setting the User bit is strange, but the ATS1H[RW] instructions > * don't seem to work otherwise, and since we never run on Xen > diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c > index 4d792a4..bcfa169 100644 > --- a/xen/arch/x86/hvm/rtc.c > +++ b/xen/arch/x86/hvm/rtc.c > @@ -730,9 +730,9 @@ void rtc_migrate_timers(struct vcpu *v) > > if ( v->vcpu_id == 0 ) > { > - migrate_timer(&s->update_timer, v->processor);; > - migrate_timer(&s->update_timer2, v->processor);; > - migrate_timer(&s->alarm_timer, v->processor);; > + migrate_timer(&s->update_timer, v->processor); > + migrate_timer(&s->update_timer2, v->processor); > + migrate_timer(&s->alarm_timer, v->processor); > } > } > > diff --git a/xen/common/domctl.c b/xen/common/domctl.c > index dfa3df9..d80488b 100644 > --- a/xen/common/domctl.c > +++ b/xen/common/domctl.c > @@ -703,7 +703,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) > if ( op->cmd == XEN_DOMCTL_setvcpuaffinity ) > { > cpumask_var_t new_affinity, old_affinity; > - cpumask_t *online = cpupool_domain_cpumask(v->domain);; > + cpumask_t *online = cpupool_domain_cpumask(v->domain); > > /* > * We want to be able to restore hard affinity if we are trying > diff --git a/xen/common/schedule.c b/xen/common/schedule.c > index 1058e19..e83f4c7 100644 > --- a/xen/common/schedule.c > +++ b/xen/common/schedule.c > @@ -700,7 +700,7 @@ void restore_vcpu_affinity(struct domain *d) > cpupool_domain_cpumask(v->domain)); > v->processor = cpumask_any(cpumask_scratch_cpu(cpu)); > > - spin_unlock_irq(lock);; > + spin_unlock_irq(lock); > > lock = vcpu_schedule_lock_irq(v); > v->processor = SCHED_OP(vcpu_scheduler(v), pick_cpu, v); >
On Tue, Jul 25, 2017 at 11:54:20AM +0100, Andrew Cooper wrote: > No functional change. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Wei Liu <wei.liu2@citrix.com> > --- > CC: George Dunlap <George.Dunlap@eu.citrix.com> > CC: Ian Jackson <ian.jackson@eu.citrix.com> > CC: Jan Beulich <JBeulich@suse.com> > CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > CC: Stefano Stabellini <sstabellini@kernel.org> > CC: Julien Grall <julien.grall@arm.com> > CC: Tim Deegan <tim@xen.org> > CC: Wei Liu <wei.liu2@citrix.com> > --- > xen/arch/arm/mm.c | 2 +- > xen/arch/x86/hvm/rtc.c | 6 +++--- > xen/common/domctl.c | 2 +- > xen/common/schedule.c | 2 +- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c > index 98260f6..a810a05 100644 > --- a/xen/arch/arm/mm.c > +++ b/xen/arch/arm/mm.c > @@ -278,7 +278,7 @@ static inline lpae_t mfn_to_xen_entry(mfn_t mfn, unsigned attr) > .contig = 0, /* Assume non-contiguous */ > .xn = 1, /* No need to execute outside .text */ > .avail = 0, /* Reference count for domheap mapping */ > - }};; > + }}; > /* > * Setting the User bit is strange, but the ATS1H[RW] instructions > * don't seem to work otherwise, and since we never run on Xen > diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c > index 4d792a4..bcfa169 100644 > --- a/xen/arch/x86/hvm/rtc.c > +++ b/xen/arch/x86/hvm/rtc.c > @@ -730,9 +730,9 @@ void rtc_migrate_timers(struct vcpu *v) > > if ( v->vcpu_id == 0 ) > { > - migrate_timer(&s->update_timer, v->processor);; > - migrate_timer(&s->update_timer2, v->processor);; > - migrate_timer(&s->alarm_timer, v->processor);; > + migrate_timer(&s->update_timer, v->processor); > + migrate_timer(&s->update_timer2, v->processor); > + migrate_timer(&s->alarm_timer, v->processor); > } > } > > diff --git a/xen/common/domctl.c b/xen/common/domctl.c > index dfa3df9..d80488b 100644 > --- a/xen/common/domctl.c > +++ b/xen/common/domctl.c > @@ -703,7 +703,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) > if ( op->cmd == XEN_DOMCTL_setvcpuaffinity ) > { > cpumask_var_t new_affinity, old_affinity; > - cpumask_t *online = cpupool_domain_cpumask(v->domain);; > + cpumask_t *online = cpupool_domain_cpumask(v->domain); > > /* > * We want to be able to restore hard affinity if we are trying > diff --git a/xen/common/schedule.c b/xen/common/schedule.c > index 1058e19..e83f4c7 100644 > --- a/xen/common/schedule.c > +++ b/xen/common/schedule.c > @@ -700,7 +700,7 @@ void restore_vcpu_affinity(struct domain *d) > cpupool_domain_cpumask(v->domain)); > v->processor = cpumask_any(cpumask_scratch_cpu(cpu)); > > - spin_unlock_irq(lock);; > + spin_unlock_irq(lock); > > lock = vcpu_schedule_lock_irq(v); > v->processor = SCHED_OP(vcpu_scheduler(v), pick_cpu, v); > -- > 2.1.4 >
On 07/25/2017 11:54 AM, Andrew Cooper wrote: > No functional change. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Acked-by: George Dunlap <george.dunlap@citrix.com>
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 98260f6..a810a05 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -278,7 +278,7 @@ static inline lpae_t mfn_to_xen_entry(mfn_t mfn, unsigned attr) .contig = 0, /* Assume non-contiguous */ .xn = 1, /* No need to execute outside .text */ .avail = 0, /* Reference count for domheap mapping */ - }};; + }}; /* * Setting the User bit is strange, but the ATS1H[RW] instructions * don't seem to work otherwise, and since we never run on Xen diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index 4d792a4..bcfa169 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -730,9 +730,9 @@ void rtc_migrate_timers(struct vcpu *v) if ( v->vcpu_id == 0 ) { - migrate_timer(&s->update_timer, v->processor);; - migrate_timer(&s->update_timer2, v->processor);; - migrate_timer(&s->alarm_timer, v->processor);; + migrate_timer(&s->update_timer, v->processor); + migrate_timer(&s->update_timer2, v->processor); + migrate_timer(&s->alarm_timer, v->processor); } } diff --git a/xen/common/domctl.c b/xen/common/domctl.c index dfa3df9..d80488b 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -703,7 +703,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) if ( op->cmd == XEN_DOMCTL_setvcpuaffinity ) { cpumask_var_t new_affinity, old_affinity; - cpumask_t *online = cpupool_domain_cpumask(v->domain);; + cpumask_t *online = cpupool_domain_cpumask(v->domain); /* * We want to be able to restore hard affinity if we are trying diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 1058e19..e83f4c7 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -700,7 +700,7 @@ void restore_vcpu_affinity(struct domain *d) cpupool_domain_cpumask(v->domain)); v->processor = cpumask_any(cpumask_scratch_cpu(cpu)); - spin_unlock_irq(lock);; + spin_unlock_irq(lock); lock = vcpu_schedule_lock_irq(v); v->processor = SCHED_OP(vcpu_scheduler(v), pick_cpu, v);
No functional change. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: George Dunlap <George.Dunlap@eu.citrix.com> CC: Ian Jackson <ian.jackson@eu.citrix.com> CC: Jan Beulich <JBeulich@suse.com> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> CC: Stefano Stabellini <sstabellini@kernel.org> CC: Julien Grall <julien.grall@arm.com> CC: Tim Deegan <tim@xen.org> CC: Wei Liu <wei.liu2@citrix.com> --- xen/arch/arm/mm.c | 2 +- xen/arch/x86/hvm/rtc.c | 6 +++--- xen/common/domctl.c | 2 +- xen/common/schedule.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)