From patchwork Tue Mar 25 16:55:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 27067 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f200.google.com (mail-qc0-f200.google.com [209.85.216.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 93A7320539 for ; Tue, 25 Mar 2014 16:58:16 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id i17sf1698284qcy.3 for ; Tue, 25 Mar 2014 09:58:16 -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:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=SdCu3KxUmLtjsxGRWHwB/rgYKPLLozzvaef1ywoZd18=; b=ClX2ClWZX5NUZHsI+gbC8h6YtGpktq7cj13aTeXrnOKzEjUVPHj+JOgM5BCO2KJ1gJ URJ4QwPvyAz3YH4UYYfx8XwW9QhE6NGg1j24ZOpWF5FnZBd/5iNqxW8uRs6jIGd2Kq/5 WAJko9wv+gTAcg80S6vJIuk396ME7gxugDuNk7jJBigmIPARnm+Wb7gsg9oe5u0Iv9U9 5N963ZVotM4flkmTTLKB6qiAkivS0olyuyYyVR2WWcGWK1bSBeeeuq0QBHbf2MM/nnR0 r78j1D/CHsawVpF2VBON2EqgK6HvVRIxnDgYcNXt01j5PrS8j2oQYw49mmgtBOp2zIDo 5W1g== X-Gm-Message-State: ALoCoQmtrcRLPIkBOlWKWUzctmUvO/ojV7xK7nkm94NnyoClkfZTxb6maQr0tNnDg2sL+NcYIrNt X-Received: by 10.236.125.6 with SMTP id y6mr20663401yhh.3.1395766696193; Tue, 25 Mar 2014 09:58:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.98.97 with SMTP id n88ls285116qge.64.gmail; Tue, 25 Mar 2014 09:58:16 -0700 (PDT) X-Received: by 10.58.222.36 with SMTP id qj4mr2086876vec.25.1395766696100; Tue, 25 Mar 2014 09:58:16 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id tg3si3864777vec.87.2014.03.25.09.58.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Mar 2014 09:58:16 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id ij19so907973vcb.24 for ; Tue, 25 Mar 2014 09:58:16 -0700 (PDT) X-Received: by 10.221.22.71 with SMTP id qv7mr824499vcb.34.1395766696033; Tue, 25 Mar 2014 09:58:16 -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.220.78.9 with SMTP id i9csp320392vck; Tue, 25 Mar 2014 09:58:15 -0700 (PDT) X-Received: by 10.220.92.135 with SMTP id r7mr56266335vcm.11.1395766695666; Tue, 25 Mar 2014 09:58:15 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id e9si3808862vct.142.2014.03.25.09.58.15 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 25 Mar 2014 09:58:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) 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 1WSUeJ-0000EZ-J1; Tue, 25 Mar 2014 16:56:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSUeH-0000B9-G3 for xen-devel@lists.xenproject.org; Tue, 25 Mar 2014 16:56:25 +0000 Received: from [193.109.254.147:16555] by server-4.bemta-14.messagelabs.com id B0/70-02781-835B1335; Tue, 25 Mar 2014 16:56:24 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-6.tower-27.messagelabs.com!1395766583!4092814!1 X-Originating-IP: [74.125.83.44] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21332 invoked from network); 25 Mar 2014 16:56:24 -0000 Received: from mail-ee0-f44.google.com (HELO mail-ee0-f44.google.com) (74.125.83.44) by server-6.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 25 Mar 2014 16:56:24 -0000 Received: by mail-ee0-f44.google.com with SMTP id e49so689645eek.3 for ; Tue, 25 Mar 2014 09:56:23 -0700 (PDT) X-Received: by 10.15.43.77 with SMTP id w53mr70113270eev.10.1395766583812; Tue, 25 Mar 2014 09:56:23 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id h47sm33377501eey.13.2014.03.25.09.56.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Mar 2014 09:56:23 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 25 Mar 2014 16:55:24 +0000 Message-Id: <1395766541-23979-18-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395766541-23979-1-git-send-email-julien.grall@linaro.org> References: <1395766541-23979-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH 17/34] xen/arm: Guard correctly asm-arm/platform/omap5.h 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: , MIME-Version: 1.0 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: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.179 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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Fix compilation with clang 3.5: xen/include/asm/platforms/omap5.h:1:9: error: '__ASM_ARM_PLATFORMS_OMAP5_H' is used as a header guard here, followed by #define of a different macro [-werror,-wheader-guard] ^~~~~~~~~~~~~~~~~~~~~~~~~~~ xen/include/asm/platforms/omap5.h:2:9: note: '__ASM_ASM_PLATFORMS_OMAP5_H' is defined here; did you mean '__ASM_ARM_PLATFORMS_OMAP5_H'? ^~~~~~~~~~~~~~~~~~~~~~~~~~~ __ASM_ARM_PLATFORMS_OMAP5_H Signed-off-by: Julien Grall Cc:Ian Campbell Cc:Stefano Stabellini Cc:Tim Deegan Acked-by:Ian Campbell --- xen/include/asm-arm/platforms/omap5.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-arm/platforms/omap5.h b/xen/include/asm-arm/platforms/omap5.h index c559c84..8867b45 100644 --- a/xen/include/asm-arm/platforms/omap5.h +++ b/xen/include/asm-arm/platforms/omap5.h @@ -1,5 +1,5 @@ #ifndef __ASM_ARM_PLATFORMS_OMAP5_H -#define __ASM_ASM_PLATFORMS_OMAP5_H +#define __ASM_ARM_PLATFORMS_OMAP5_H #define REALTIME_COUNTER_BASE 0x48243200 #define INCREMENTER_NUMERATOR_OFFSET 0x10