[For Xen-4.10 PATCH] Ensure invalidate_icache() definition is visible only when !__ASSEMBLY__

[Punit Agrawal <punit.agrawal@arm.com>]

Commit edff605421 introduces an empty invalidate_icache() function in
page.h for x86 but mistakenly places it outside the !__ASSEMBLY__
block. This causes build failure on x86.

Address this by moving the function definition to within the existing
!__ASSEMBLY__ block.

Fixes: edff605421 ("Avoid excess icache flushes in populate_physmap() before domain has been created")
Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
---
Hi Stefano, Jan,

This commit fixes the build breakage in staging for me. I'm not sure
whether staging gets rebased so sending this as a separate commit.

Please feel free to fold it in if that makes sense.

Once again apologies for the breakage.

Punit

xen/include/asm-x86/page.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h
index 9b86d5183a..474b9bde78 100644
--- a/xen/include/asm-x86/page.h
+++ b/xen/include/asm-x86/page.h
@@ -371,10 +371,6 @@ perms_strictly_increased(uint32_t old_flags, uint32_t new_flags)
     return ((of | (of ^ nf)) == nf);
 }
 
-#endif /* !__ASSEMBLY__ */
-
-#define PAGE_ALIGN(x) (((x) + PAGE_SIZE - 1) & PAGE_MASK)
-
 static inline void invalidate_icache(void)
 {
 /*
@@ -383,6 +379,10 @@ static inline void invalidate_icache(void)
  */
 }
 
+#endif /* !__ASSEMBLY__ */
+
+#define PAGE_ALIGN(x) (((x) + PAGE_SIZE - 1) & PAGE_MASK)
+
 #endif /* __X86_PAGE_H__ */
 
 /*
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel