All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xen.org
Cc: julien.grall@linaro.org, tim@xen.org,
	Ian Campbell <ian.campbell@citrix.com>,
	stefano.stabellini@eu.citrix.com
Subject: [PATCH v2 3/9] xen: arm: prefer typesafe max()/min() over MAX()/MIN()
Date: Thu, 26 Jun 2014 17:45:45 +0100	[thread overview]
Message-ID: <1403801151-11007-3-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1403801130.31742.1.camel@kazak.uk.xensource.com>

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Julien Grall <julien.grall@linaro.org>
---
 xen/arch/arm/p2m.c       |    4 ++--
 xen/common/device_tree.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index 9960e17..dd2c5a4 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -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;
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index 48ae849..03d495a 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -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,
-- 
1.7.10.4

  parent reply	other threads:[~2014-06-26 16:45 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-26 16:45 [PATCH v2 0/9] xen: arm: Refactor/improve early DT parsing and multiboot module support Ian Campbell
2014-06-26 16:45 ` [PATCH v2 1/9] xen: arm: implement generic multiboot compatibility strings Ian Campbell
2014-06-26 16:45 ` [PATCH v2 2/9] xen: arm: /chosen/module@N/bootargs bootprotcol node is not deprecated Ian Campbell
2014-06-26 16:45 ` Ian Campbell [this message]
2014-06-26 16:45 ` [PATCH v2 4/9] xen: arm: rename early_info structs Ian Campbell
2014-06-26 16:45 ` [PATCH v2 5/9] xen: arm: move boot time fdt parsing into separate file Ian Campbell
2014-06-26 16:45 ` [PATCH v2 6/9] xen: arm: move device_tree_bootargs to bootfdt.c, renaming to boot_fdt_cmdline Ian Campbell
2014-06-26 16:45 ` [PATCH v2 7/9] xen: arm: store per-boot module type instead of relying on index Ian Campbell
2014-06-27 10:43   ` Julien Grall
2014-06-27 12:27     ` Ian Campbell
2014-06-26 16:45 ` [PATCH v2 8/9] xen: arm: support bootmodule type detection by ordering Ian Campbell
2014-06-26 16:45 ` [PATCH v2 9/9] xen: arm: update multiboot device tree bindings Ian Campbell
2014-06-26 16:46 ` [PATCH v2 0/9] xen: arm: Refactor/improve early DT parsing and multiboot module support Ian Campbell
2014-06-27 11:58   ` Fu Wei

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1403801151-11007-3-git-send-email-ian.campbell@citrix.com \
    --to=ian.campbell@citrix.com \
    --cc=julien.grall@linaro.org \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=tim@xen.org \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.