@@ -500,8 +500,8 @@ static int apply_p2m_changes(struct domain *d,
unsigned long sgfn = paddr_to_pfn(start_gpaddr);
unsigned long egfn = paddr_to_pfn(end_gpaddr);
- p2m->max_mapped_gfn = MAX(p2m->max_mapped_gfn, egfn);
- p2m->lowest_mapped_gfn = MIN(p2m->lowest_mapped_gfn, sgfn);
+ p2m->max_mapped_gfn = max(p2m->max_mapped_gfn, egfn);
+ p2m->lowest_mapped_gfn = min(p2m->lowest_mapped_gfn, sgfn);
}
rc = 0;
@@ -425,7 +425,7 @@ static void __init process_chosen_node(const void *fdt, int node,
mod->start = start;
mod->size = end - start;
- early_info.modules.nr_mods = MAX(MOD_INITRD, early_info.modules.nr_mods);
+ early_info.modules.nr_mods = max(MOD_INITRD, early_info.modules.nr_mods);
}
static int __init early_scan_node(const void *fdt,
Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- xen/arch/arm/p2m.c | 4 ++-- xen/common/device_tree.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)