[Xen-changelog] [xen master] xen/arm32: mm: Rework is_xen_heap_page to avoid nameclash

[patchbot@xxxxxxx]

commit c6c2fc6e4919a1420096b94a4ba8682f20e92709
Author:     Julien Grall <julien.grall@xxxxxxxxxx>
AuthorDate: Wed Nov 1 14:03:14 2017 +0000
Commit:     Stefano Stabellini <sstabellini@xxxxxxxxxx>
CommitDate: Mon Dec 11 15:18:08 2017 -0800

    xen/arm32: mm: Rework is_xen_heap_page to avoid nameclash
    
    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>
---
 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 ad2f2a4..4d5563b 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)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog