From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: Re: [PATCH v3 1/5] xen: Add macros MB and GB
Date: Fri, 27 Sep 2013 18:01:28 +0100
Message-ID: <5245B9E8.2090607@citrix.com>
References: <1380300997-28099-1-git-send-email-julien.grall@linaro.org>
	<1380300997-28099-2-git-send-email-julien.grall@linaro.org>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1380300997-28099-2-git-send-email-julien.grall@linaro.org>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Julien Grall <julien.grall@linaro.org>
Cc: Keir Fraser <keir@xen.org>, ian.campbell@citrix.com, patches@linaro.org, stefano.stabellini@eu.citrix.com, tim@xen.org, xen-devel@lists.xen.org, Jan Beulich <jbeulich@suse.com>
List-Id: xen-devel@lists.xenproject.org

On 27/09/13 17:56, Julien Grall wrote:
> Signed-off-by: Julien Grall <julien.grall@linaro.org>
> CC: Keir Fraser <keir@xen.org>
> CC: Jan Beulich <jbeulich@suse.com>
>
> ---
>     Changes in v3:
>         - Add GB
>         - Move to common code (include/xen/config.h)
> ---
>  xen/include/asm-arm/config.h |    1 -
>  xen/include/xen/config.h     |    3 +++
>  2 files changed, 3 insertions(+), 1 deletion(-)

You will also need to delete GB() from xen/include/asm-x86/config.h for
this to compile.

~Andrew

>
> diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h
> index 9e395c2..5b7b1a8 100644
> --- a/xen/include/asm-arm/config.h
> +++ b/xen/include/asm-arm/config.h
> @@ -142,7 +142,6 @@
>  #define SLOT0_ENTRY_BITS  39
>  #define SLOT0(slot) (_AT(vaddr_t,slot) << SLOT0_ENTRY_BITS)
>  #define SLOT0_ENTRY_SIZE  SLOT0(1)
> -#define GB(_gb)     (_AC(_gb, UL) << 30)
>  
>  #define VMAP_VIRT_START  GB(1)
>  #define VMAP_VIRT_END    (VMAP_VIRT_START + GB(1) - 1)
> diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h
> index a52298e..657c6e5 100644
> --- a/xen/include/xen/config.h
> +++ b/xen/include/xen/config.h
> @@ -69,6 +69,9 @@
>  #define __force
>  #define __bitwise
>  
> +#define MB(_mb)     (_AC(_mb, UL) << 20)
> +#define GB(_gb)     (_AC(_gb, UL) << 30)
> +
>  #ifndef __ASSEMBLY__
>  
>  int current_domain_id(void);