From: Ian Campbell Date: Fri, 18 Jul 2014 13:08:13 +0000 (+0100) Subject: xen: arm: prefer typesafe max()/min() over MAX()/MIN() X-Git-Tag: 4.5.0-rc1~475 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5bedebbfe47b4cf192e231c76d7f2cb9b1c198b4;p=xen.git xen: arm: prefer typesafe max()/min() over MAX()/MIN() Signed-off-by: Ian Campbell Acked-by: Julien Grall --- diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 8ffddacb06..143199bdf5 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -816,8 +816,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; diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 3d18d7f0cb..dba2fbabff 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -427,7 +427,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,