Message ID | 20170912100330.2168-21-julien.grall@arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, 12 Sep 2017, Julien Grall wrote: > The parameter 'ai' is used either for attribute index or for > permissions. Follow-up patch will rework that parameters to carry more > information. So rename the parameter to 'flags'. > > Signed-off-by: Julien Grall <julien.grall@arm.com> > Reviewed-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > > Changes in v2: > - Add Andre's reviewed-by > --- > xen/arch/arm/mm.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c > index b3286b4a89..3379d29f8a 100644 > --- a/xen/arch/arm/mm.c > +++ b/xen/arch/arm/mm.c > @@ -986,7 +986,7 @@ static int create_xen_entries(enum xenmap_operation op, > unsigned long virt, > mfn_t mfn, > unsigned long nr_mfns, > - unsigned int ai) > + unsigned int flags) > { > int rc; > unsigned long addr = virt, addr_end = addr + nr_mfns * PAGE_SIZE; > @@ -1021,7 +1021,7 @@ static int create_xen_entries(enum xenmap_operation op, > } > if ( op == RESERVE ) > break; > - pte = mfn_to_xen_entry(mfn, ai); > + pte = mfn_to_xen_entry(mfn, flags); > pte.pt.table = 1; > write_pte(entry, pte); > break; > @@ -1038,8 +1038,8 @@ static int create_xen_entries(enum xenmap_operation op, > else > { > pte = *entry; > - pte.pt.ro = PTE_RO_MASK(ai); > - pte.pt.xn = PTE_NX_MASK(ai); > + pte.pt.ro = PTE_RO_MASK(flags); > + pte.pt.xn = PTE_NX_MASK(flags); > if ( !pte.pt.ro && !pte.pt.xn ) > { > printk("%s: Incorrect combination for addr=%lx\n", > -- > 2.11.0 >
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index b3286b4a89..3379d29f8a 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -986,7 +986,7 @@ static int create_xen_entries(enum xenmap_operation op, unsigned long virt, mfn_t mfn, unsigned long nr_mfns, - unsigned int ai) + unsigned int flags) { int rc; unsigned long addr = virt, addr_end = addr + nr_mfns * PAGE_SIZE; @@ -1021,7 +1021,7 @@ static int create_xen_entries(enum xenmap_operation op, } if ( op == RESERVE ) break; - pte = mfn_to_xen_entry(mfn, ai); + pte = mfn_to_xen_entry(mfn, flags); pte.pt.table = 1; write_pte(entry, pte); break; @@ -1038,8 +1038,8 @@ static int create_xen_entries(enum xenmap_operation op, else { pte = *entry; - pte.pt.ro = PTE_RO_MASK(ai); - pte.pt.xn = PTE_NX_MASK(ai); + pte.pt.ro = PTE_RO_MASK(flags); + pte.pt.xn = PTE_NX_MASK(flags); if ( !pte.pt.ro && !pte.pt.xn ) { printk("%s: Incorrect combination for addr=%lx\n",