Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 154609
b: refs/heads/master
c: 58782b3
h: refs/heads/master
i:
  154607: 77c6737
v: v3
  • Loading branch information
Joe Perches authored and Tony Luck committed Jun 30, 2009
1 parent a3ac300 commit 265379a
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2be8412c6cef97b01dfaae71c04bf585d3d93a3b
refs/heads/master: 58782b34e9ffcc04619634efe9658263344ed188
2 changes: 1 addition & 1 deletion trunk/arch/ia64/kernel/esi.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static int __init esi_init (void)
}

if (!esi)
return -ENODEV;;
return -ENODEV;

systab = __va(esi);

Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/ia64/kvm/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ static void collect_interruption(struct kvm_vcpu *vcpu)
if (vdcr & IA64_DCR_PP) {
vpsr |= IA64_PSR_PP;
} else {
vpsr &= ~IA64_PSR_PP;;
vpsr &= ~IA64_PSR_PP;
}

vcpu_set_psr(vcpu, vpsr);
Expand Down Expand Up @@ -594,11 +594,11 @@ static void set_pal_call_data(struct kvm_vcpu *vcpu)
p->u.pal_data.gr30 = vcpu_get_gr(vcpu, 30);
break;
case PAL_BRAND_INFO:
p->u.pal_data.gr29 = gr29;;
p->u.pal_data.gr29 = gr29;
p->u.pal_data.gr30 = kvm_trans_pal_call_args(vcpu, gr30);
break;
default:
p->u.pal_data.gr29 = gr29;;
p->u.pal_data.gr29 = gr29;
p->u.pal_data.gr30 = vcpu_get_gr(vcpu, 30);
}
p->u.pal_data.gr28 = gr28;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/ia64/kvm/vcpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ void getreg(unsigned long regnum, unsigned long *val,
* Now look at registers in [0-31] range and init correct UNAT
*/
addr = (unsigned long)regs;
unat = &regs->eml_unat;;
unat = &regs->eml_unat;

addr += gr_info[regnum];

Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/ia64/kvm/vtlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ struct thash_data *__vtr_lookup(struct kvm_vcpu *vcpu, u64 va, int type)
u64 rid;

rid = vcpu_get_rr(vcpu, va);
rid = rid & RR_RID_MASK;;
rid = rid & RR_RID_MASK;
if (type == D_TLB) {
if (vcpu_quick_region_check(vcpu->arch.dtr_regions, va)) {
for (trp = (struct thash_data *)&vcpu->arch.dtrs, i = 0;
Expand Down Expand Up @@ -518,7 +518,7 @@ struct thash_data *vtlb_lookup(struct kvm_vcpu *v, u64 va, int is_data)

struct thash_cb *hcb = &v->arch.vtlb;

cch = __vtr_lookup(v, va, is_data);;
cch = __vtr_lookup(v, va, is_data);
if (cch)
return cch;

Expand Down

0 comments on commit 265379a

Please sign in to comment.