Re: [Xen-devel] [PATCH v3 for-next 2/4] xen/arm32: mm: Rework is_xen_heap_page to avoid nameclash

[Stefano Stabellini <sstabellini@xxxxxxxxxx>]

On Wed, 1 Nov 2017, Julien Grall wrote:
> The arm32 version of the function is_xen_heap_page currently define a
> variable _mfn. This will lead to a compiler when use typesafe MFN in a
> follow-up patch:
> 
> called object '_mfn' is not a function or function pointer
> 
> Fix it by renaming the local variable _mfn to mfn_.
> 
> Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx>

Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>


> ---
> 
> Cc: Stefano Stabellini <sstabellini@xxxxxxxxxx>
> 
>     Changes in v3:
>         - Fix typo in the commit message
> ---
>  xen/include/asm-arm/mm.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h
> index cd6dfb54b9..737a429409 100644
> --- a/xen/include/asm-arm/mm.h
> +++ b/xen/include/asm-arm/mm.h
> @@ -140,9 +140,9 @@ extern vaddr_t xenheap_virt_start;
>  #ifdef CONFIG_ARM_32
>  #define is_xen_heap_page(page) is_xen_heap_mfn(page_to_mfn(page))
>  #define is_xen_heap_mfn(mfn) ({                                 \
> -    unsigned long _mfn = (mfn);                                 \
> -    (_mfn >= mfn_x(xenheap_mfn_start) &&                        \
> -     _mfn < mfn_x(xenheap_mfn_end));                            \
> +    unsigned long mfn_ = (mfn);                                 \
> +    (mfn_ >= mfn_x(xenheap_mfn_start) &&                        \
> +     mfn_ < mfn_x(xenheap_mfn_end));                            \
>  })
>  #else
>  #define is_xen_heap_page(page) ((page)->count_info & PGC_xen_heap)
> -- 
> 2.11.0
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel