From patchwork Fri Jul 18 13:08:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 33844 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 42E9B213FD for ; Fri, 18 Jul 2014 13:10:45 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id fp1sf25116465pdb.5 for ; Fri, 18 Jul 2014 06:10:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=nYBThuZ0ztC80ajIwiF7EBc8u8v1BdqywW9Ng/UzW34=; b=EH2aQSKhcXYTAmkdl2HaXMHqwlQvTrwRZRcNTgjAKRKnrmljKhsLSHy0U0UFcU5NuB h3+OWGkKOzDpj9Wd+96Lt/F7Qt7UuBPdc6giI25p28jD2ppQsWlgU6yoKP7T9Ywxd2c1 XVz+V11Zb33dXTQHoX2HfzC8lWrSUW3znIS8AhVfnD/rgA3kjsJ97Ki+t+IzVnvQfGwD FsJ5JqKPlqB5RdJqX0tFMDE1pxDtb5I3zco0kj6fstqablNMTKjRGkgnwrY25aPzQekB Kp4jLpsVANhvSWuPpljXh5hyt2X6Jl1IB1K+e/NFh4dYiSqhmbUpvSzjcL2BUNS2BuxV elJw== X-Gm-Message-State: ALoCoQkffuhZHYN/8+vMCXhpR3HxIqsqdwB+qhBiTSRi8HXU5ER4DU5ag4BuT0WBr78qgJ/THaPi X-Received: by 10.66.65.202 with SMTP id z10mr2227795pas.45.1405689042293; Fri, 18 Jul 2014 06:10:42 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.92.120 with SMTP id a111ls970035qge.15.gmail; Fri, 18 Jul 2014 06:10:42 -0700 (PDT) X-Received: by 10.52.135.7 with SMTP id po7mr4814795vdb.50.1405689042179; Fri, 18 Jul 2014 06:10:42 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id yn9si5577394vdb.75.2014.07.18.06.10.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 18 Jul 2014 06:10:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id la4so7273420vcb.33 for ; Fri, 18 Jul 2014 06:10:40 -0700 (PDT) X-Received: by 10.220.44.141 with SMTP id a13mr3516774vcf.71.1405689040658; Fri, 18 Jul 2014 06:10:40 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp9806vcb; Fri, 18 Jul 2014 06:10:40 -0700 (PDT) X-Received: by 10.52.186.103 with SMTP id fj7mr4704949vdc.53.1405689039168; Fri, 18 Jul 2014 06:10:39 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id mb10si5588418vcb.59.2014.07.18.06.10.38 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 18 Jul 2014 06:10:39 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X87tl-0005Ty-UY; Fri, 18 Jul 2014 13:08:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X87tj-0005ST-Qm for xen-devel@lists.xen.org; Fri, 18 Jul 2014 13:08:27 +0000 Received: from [193.109.254.147:26821] by server-8.bemta-14.messagelabs.com id AF/B8-07074-B4C19C35; Fri, 18 Jul 2014 13:08:27 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1405688903!18249637!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6635 invoked from network); 18 Jul 2014 13:08:25 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-14.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 18 Jul 2014 13:08:25 -0000 X-IronPort-AV: E=Sophos;i="5.01,685,1400025600"; d="scan'208";a="153665154" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 18 Jul 2014 13:08:24 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Fri, 18 Jul 2014 09:08:24 -0400 Received: from marilith-n13-p0.uk.xensource.com ([10.80.229.115] helo=localhost.localdomain) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1X87tf-0001RC-36; Fri, 18 Jul 2014 14:08:24 +0100 Received: by localhost.localdomain (sSMTP sendmail emulation); Fri, 18 Jul 2014 14:08:23 +0100 From: Ian Campbell To: Date: Fri, 18 Jul 2014 14:08:13 +0100 Message-ID: <1405688900-11769-3-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1405688876.491.10.camel@kazak.uk.xensource.com> References: <1405688876.491.10.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: julien.grall@linaro.org, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com Subject: [Xen-devel] [PATCH v3 03/10] xen: arm: prefer typesafe max()/min() over MAX()/MIN() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Signed-off-by: Ian Campbell Acked-by: Julien Grall --- 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 2f855b5..18a3c9f 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -812,8 +812,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 3d18d7f..dba2fba 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,