[xen stable-4.17] x86/shadow: Fix build with no PG_log_dirty

[patchbot@xxxxxxx]

commit 11c8ef59b9024849c0fc224354904615d5579628
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Fri Mar 31 08:32:11 2023 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Mar 31 08:32:11 2023 +0200

    x86/shadow: Fix build with no PG_log_dirty
    
    Gitlab Randconfig found:
    
      arch/x86/mm/shadow/common.c: In function 'shadow_prealloc':
      arch/x86/mm/shadow/common.c:1023:18: error: implicit declaration of 
function
          'paging_logdirty_levels'; did you mean 'paging_log_dirty_init'? 
[-Werror=implicit-function-declaration]
       1023 |         count += paging_logdirty_levels();
            |                  ^~~~~~~~~~~~~~~~~~~~~~
            |                  paging_log_dirty_init
      arch/x86/mm/shadow/common.c:1023:18: error: nested extern declaration of 
'paging_logdirty_levels' [-Werror=nested-externs]
    
    The '#if PG_log_dirty' expression is currently SHADOW_PAGING && !HVM &&
    PV_SHIM_EXCLUSIVE.  Move the declaration outside.
    
    Fixes: 33fb3a661223 ("x86/shadow: account for log-dirty mode when 
pre-allocating")
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
    master commit: 6d14cb105b1c54ad7b4228d858ae85aa8a672bbd
    master date: 2023-03-24 12:16:31 +0000
---
 xen/arch/x86/include/asm/paging.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xen/arch/x86/include/asm/paging.h 
b/xen/arch/x86/include/asm/paging.h
index 635ccc83b1..6f7000d5f4 100644
--- a/xen/arch/x86/include/asm/paging.h
+++ b/xen/arch/x86/include/asm/paging.h
@@ -152,6 +152,10 @@ struct paging_mode {
 /*****************************************************************************
  * Log dirty code */
 
+#define paging_logdirty_levels() \
+    (DIV_ROUND_UP(PADDR_BITS - PAGE_SHIFT - (PAGE_SHIFT + 3), \
+                  PAGE_SHIFT - ilog2(sizeof(mfn_t))) + 1)
+
 #if PG_log_dirty
 
 /* get the dirty bitmap for a specific range of pfns */
@@ -190,10 +194,6 @@ bool paging_mfn_is_dirty(const struct domain *d, mfn_t 
gmfn);
 #define L4_LOGDIRTY_IDX(pfn) ((pfn_x(pfn) >> (PAGE_SHIFT + 3 + PAGETABLE_ORDER 
* 2)) & \
                               (LOGDIRTY_NODE_ENTRIES-1))
 
-#define paging_logdirty_levels() \
-    (DIV_ROUND_UP(PADDR_BITS - PAGE_SHIFT - (PAGE_SHIFT + 3), \
-                  PAGE_SHIFT - ilog2(sizeof(mfn_t))) + 1)
-
 #ifdef CONFIG_HVM
 /* VRAM dirty tracking support */
 struct sh_dirty_vram {
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.17