From: Julien Grall Date: Wed, 1 Nov 2017 14:03:14 +0000 (+0000) Subject: xen/arm32: mm: Rework is_xen_heap_page to avoid nameclash X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~944 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c6c2fc6e4919a1420096b94a4ba8682f20e92709;p=xen.git 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 Reviewed-by: Stefano Stabellini --- diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index ad2f2a43dc..4d5563b0ce 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)