xen: Replace u64 with uint64_t in pdx_init_mask() and callers

Xen is phasing out the use of u64 in favor of uint64_t. Therefore, the
instance of u64 in the pdx_init_mask() (and the callers) are now
replaced with uint64_t. Take the opportunity to also modify
srat_region_mask as this is used to store the result of pdx_init_mask().

Signed-off-by: Stefano Stabellini <stefanos@xilinx.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: julien.grall@arm.com

diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 4156c0ebb330627c19f7ce653c512562c5f760dd..d5d188a10581dcec365dc9aab674a8387c1df6b3 100644 (file)
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -484,7 +484,7 @@ static void __init init_pdx(void)
 {
     paddr_t bank_start, bank_size, bank_end;
 
-    u64 mask = pdx_init_mask(bootinfo.mem.bank[0].start);
+    uint64_t mask = pdx_init_mask(bootinfo.mem.bank[0].start);
     int bank;
 
     for ( bank = 0 ; bank < bootinfo.mem.nr_banks; bank++ )

diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c
index 2d70b45909e26e7054535c8e21b9d46c34b9a63a..47a42672208531eeef52f812d4207a9fbe5b99a0 100644 (file)
--- a/xen/arch/x86/srat.c
+++ b/xen/arch/x86/srat.c
@@ -401,7 +401,7 @@ static int __init nodes_cover_memory(void)
 
 void __init acpi_numa_arch_fixup(void) {}
 
-static u64 __initdata srat_region_mask;
+static uint64_t __initdata srat_region_mask;
 
 static int __init srat_parse_region(struct acpi_subtable_header *header,
                                    const unsigned long end)

diff --git a/xen/common/pdx.c b/xen/common/pdx.c
index bb7e437049620a8fbe270e03e0a0ec7bf5670073..8356f03ce86e4f46779a887319392d1a90f18635 100644 (file)
--- a/xen/common/pdx.c
+++ b/xen/common/pdx.c
@@ -50,7 +50,7 @@ static u64 __init fill_mask(u64 mask)
     return mask;
 }
 
-u64 __init pdx_init_mask(u64 base_addr)
+uint64_t __init pdx_init_mask(uint64_t base_addr)
 {
     return fill_mask(base_addr - 1);
 }

diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h
index a151aac1a228cd02084b783b1d7a07456404178d..770fadc06cce3511df17de3ffdba8b9f89852e0d 100644 (file)
--- a/xen/include/xen/pdx.h
+++ b/xen/include/xen/pdx.h
@@ -13,7 +13,7 @@ extern unsigned long pfn_top_mask, ma_top_mask;
                          (sizeof(*frame_table) & -sizeof(*frame_table)))
 extern unsigned long pdx_group_valid[];
 
-extern u64 pdx_init_mask(u64 base_addr);
+extern uint64_t pdx_init_mask(u64 base_addr);
 extern u64 pdx_region_mask(u64 base, u64 len);
 
 extern void set_pdx_range(unsigned long smfn, unsigned long emfn);