| Message ID | 20170613161323.25196-24-julien.grall@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 13 Jun 2017, Julien Grall wrote: > The file xen/arch/arm/livepatch.c is using typesafe MFN in most of > the place. The only caller to virt_to_mfn is using with _mfn(...). > > To avoid extra _mfn(...), re-define virt_to_mfn within > xen/arch/arm/livepatch.c to handle typesafe MFN. > > Signed-off-by: Julien Grall <julien.grall@arm.com> > Cc: Ross Lagerwall <ross.lagerwall@citrix.com> > Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > xen/arch/arm/livepatch.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/xen/arch/arm/livepatch.c b/xen/arch/arm/livepatch.c > index de95e54744..3e53524365 100644 > --- a/xen/arch/arm/livepatch.c > +++ b/xen/arch/arm/livepatch.c > @@ -12,6 +12,10 @@ > #include <asm/livepatch.h> > #include <asm/mm.h> > > +/* Override macros from asm/page.h to make them work with mfn_t */ > +#undef virt_to_mfn > +#define virt_to_mfn(va) _mfn(__virt_to_mfn(va)) > + > void *vmap_of_xen_text; > > int arch_livepatch_quiesce(void) > @@ -22,7 +26,7 @@ int arch_livepatch_quiesce(void) > if ( vmap_of_xen_text ) > return -EINVAL; > > - text_mfn = _mfn(virt_to_mfn(_start)); > + text_mfn = virt_to_mfn(_start); > text_order = get_order_from_bytes(_end - _start); > > /* > -- > 2.11.0 >
diff --git a/xen/arch/arm/livepatch.c b/xen/arch/arm/livepatch.c index de95e54744..3e53524365 100644 --- a/xen/arch/arm/livepatch.c +++ b/xen/arch/arm/livepatch.c @@ -12,6 +12,10 @@ #include <asm/livepatch.h> #include <asm/mm.h> +/* Override macros from asm/page.h to make them work with mfn_t */ +#undef virt_to_mfn +#define virt_to_mfn(va) _mfn(__virt_to_mfn(va)) + void *vmap_of_xen_text; int arch_livepatch_quiesce(void) @@ -22,7 +26,7 @@ int arch_livepatch_quiesce(void) if ( vmap_of_xen_text ) return -EINVAL; - text_mfn = _mfn(virt_to_mfn(_start)); + text_mfn = virt_to_mfn(_start); text_order = get_order_from_bytes(_end - _start); /*
The file xen/arch/arm/livepatch.c is using typesafe MFN in most of the place. The only caller to virt_to_mfn is using with _mfn(...). To avoid extra _mfn(...), re-define virt_to_mfn within xen/arch/arm/livepatch.c to handle typesafe MFN. Signed-off-by: Julien Grall <julien.grall@arm.com> Cc: Ross Lagerwall <ross.lagerwall@citrix.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> --- xen/arch/arm/livepatch.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)