| Message ID | 20170619165753.25049-17-julien.grall@arm.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xen/arm: Clean-up memory subsystems | expand |
On Mon, 19 Jun 2017, Julien Grall wrote: > Signed-off-by: Julien Grall <julien.grall@arm.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > > Changes in v2: > - Patch added > --- > xen/arch/arm/mm.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c > index 657fee0b17..91af4c8743 100644 > --- a/xen/arch/arm/mm.c > +++ b/xen/arch/arm/mm.c > @@ -996,7 +996,7 @@ static int create_xen_entries(enum xenmap_operation op, > { > rc = create_xen_table(entry); > if ( rc < 0 ) { > - printk("create_xen_entries: L2 failed\n"); > + printk("%s: L2 failed\n", __func__); > goto out; > } > } > @@ -1011,8 +1011,8 @@ static int create_xen_entries(enum xenmap_operation op, > case RESERVE: > if ( lpae_valid(*entry) ) > { > - printk("create_xen_entries: trying to replace an existing mapping addr=%lx mfn=%"PRI_mfn"\n", > - addr, mfn_x(mfn)); > + printk("%s: trying to replace an existing mapping addr=%lx mfn=%"PRI_mfn"\n", > + __func__, addr, mfn_x(mfn)); > return -EINVAL; > } > if ( op == RESERVE ) > @@ -1025,8 +1025,8 @@ static int create_xen_entries(enum xenmap_operation op, > case REMOVE: > if ( !lpae_valid(*entry) ) > { > - printk("create_xen_entries: trying to %s a non-existing mapping addr=%lx\n", > - op == REMOVE ? "remove" : "modify", addr); > + printk("%s: trying to %s a non-existing mapping addr=%lx\n", > + __func__, op == REMOVE ? "remove" : "modify", addr); > return -EINVAL; > } > if ( op == REMOVE ) > @@ -1038,8 +1038,8 @@ static int create_xen_entries(enum xenmap_operation op, > pte.pt.xn = PTE_NX_MASK(ai); > if ( !pte.pt.ro && !pte.pt.xn ) > { > - printk("create_xen_entries: Incorrect combination for addr=%lx\n", > - addr); > + printk("%s: Incorrect combination for addr=%lx\n", > + __func__, addr); > return -EINVAL; > } > } > -- > 2.11.0 >
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 657fee0b17..91af4c8743 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -996,7 +996,7 @@ static int create_xen_entries(enum xenmap_operation op, { rc = create_xen_table(entry); if ( rc < 0 ) { - printk("create_xen_entries: L2 failed\n"); + printk("%s: L2 failed\n", __func__); goto out; } } @@ -1011,8 +1011,8 @@ static int create_xen_entries(enum xenmap_operation op, case RESERVE: if ( lpae_valid(*entry) ) { - printk("create_xen_entries: trying to replace an existing mapping addr=%lx mfn=%"PRI_mfn"\n", - addr, mfn_x(mfn)); + printk("%s: trying to replace an existing mapping addr=%lx mfn=%"PRI_mfn"\n", + __func__, addr, mfn_x(mfn)); return -EINVAL; } if ( op == RESERVE ) @@ -1025,8 +1025,8 @@ static int create_xen_entries(enum xenmap_operation op, case REMOVE: if ( !lpae_valid(*entry) ) { - printk("create_xen_entries: trying to %s a non-existing mapping addr=%lx\n", - op == REMOVE ? "remove" : "modify", addr); + printk("%s: trying to %s a non-existing mapping addr=%lx\n", + __func__, op == REMOVE ? "remove" : "modify", addr); return -EINVAL; } if ( op == REMOVE ) @@ -1038,8 +1038,8 @@ static int create_xen_entries(enum xenmap_operation op, pte.pt.xn = PTE_NX_MASK(ai); if ( !pte.pt.ro && !pte.pt.xn ) { - printk("create_xen_entries: Incorrect combination for addr=%lx\n", - addr); + printk("%s: Incorrect combination for addr=%lx\n", + __func__, addr); return -EINVAL; } }
Signed-off-by: Julien Grall <julien.grall@arm.com> --- Changes in v2: - Patch added --- xen/arch/arm/mm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)