From patchwork Thu Sep 26 12:56:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 20599 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ACB1823A4E for ; Thu, 26 Sep 2013 12:56:55 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id r5sf917696qcx.0 for ; Thu, 26 Sep 2013 05:56:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=D7rpkga2OUhj3b+GEkrm9jYxUdos3uquA09/zxzKoJ0=; b=Y9cN6wJAwE1kwZrgBq+S/pAi/TdzCP+RrmLMuLzp8X2QsL2Whig6MMiBMe6xSlTh69 sU8ah+I5Ek+Y1IEJkeqE9zYMEknW6tr/diJIR61t9AID5ZZZ/qPmxg3hUBTn8rvOCxYv ES7AWc5eUe7pD67iAZIucV08zvdB4t82S4A2n/cSD8022fMKAZT0+kxo1GG9jel7Nu0K 2HP+VK/RrH1wxoIwAdywgjCh6p/8QA4LBLNU+47FH7RhOH8Q0csPKK5hsKWPeuMuEwhh O250ZJzqMWmL9qDQqgdhRgtLAiRoj722rVVo1u6WbRu2Z42CyNI43+QuMSCvqGc5msdv iouQ== X-Gm-Message-State: ALoCoQmJEC2q+Xf6SENvFJjD6WBLJSJtZtBU9IhwWJmgDaeP6sOeFqBGGxPWDuW2Yb/p28fNzApG X-Received: by 10.236.26.202 with SMTP id c50mr150135yha.14.1380200215331; Thu, 26 Sep 2013 05:56:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.35.10 with SMTP id d10ls873924qej.19.gmail; Thu, 26 Sep 2013 05:56:55 -0700 (PDT) X-Received: by 10.220.164.202 with SMTP id f10mr505623vcy.25.1380200215257; Thu, 26 Sep 2013 05:56:55 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id mj10si356931vcb.87.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 05:56:55 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id db12so837045veb.22 for ; Thu, 26 Sep 2013 05:56:25 -0700 (PDT) X-Received: by 10.58.133.66 with SMTP id pa2mr545582veb.18.1380200185156; Thu, 26 Sep 2013 05:56:25 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp364667vcz; Thu, 26 Sep 2013 05:56:24 -0700 (PDT) X-Received: by 10.180.10.33 with SMTP id f1mr27597463wib.44.1380200184186; Thu, 26 Sep 2013 05:56:24 -0700 (PDT) Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by mx.google.com with ESMTPS id lf9si586173wjc.146.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 05:56:24 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.171 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=74.125.82.171; Received: by mail-we0-f171.google.com with SMTP id t61so1088208wes.16 for ; Thu, 26 Sep 2013 05:56:23 -0700 (PDT) X-Received: by 10.180.91.16 with SMTP id ca16mr623938wib.57.1380200183751; Thu, 26 Sep 2013 05:56:23 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id e1sm27960510wij.6.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 05:56:22 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Cc: stefano.stabellini@eu.citrix.com, ian.campbell@citrix.com, patches@linaro.org, andre.przywara@linaro.org, Julien Grall Subject: [PATCH v2 2/4] xen/arm: Add macro ALIGN Date: Thu, 26 Sep 2013 13:56:16 +0100 Message-Id: <1380200178-30776-3-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1380200178-30776-1-git-send-email-julien.grall@linaro.org> References: <1380200178-30776-1-git-send-email-julien.grall@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Signed-off-by: Julien Grall --- xen/common/device_tree.c | 2 -- xen/include/asm-arm/config.h | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 9a16650..32cbb1e 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -65,8 +65,6 @@ static LIST_HEAD(aliases_lookup); printk(fmt, ## __VA_ARGS__); \ } while (0) -#define ALIGN(x, a) ((x + (a) - 1) & ~((a) - 1)); - // #define DEBUG_DT #ifdef DEBUG_DT diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 2cea1ba..35f3b29 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -186,6 +186,10 @@ #define STACK_SIZE (PAGE_SIZE << STACK_ORDER) #ifndef __ASSEMBLY__ +#define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1)) +#endif + +#ifndef __ASSEMBLY__ extern unsigned long xen_phys_start; extern unsigned long xenheap_phys_end; extern unsigned long frametable_virt_end;