From patchwork Tue Mar 25 16:55:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 27055 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 22C282057C for ; Tue, 25 Mar 2014 16:57:39 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id e16sf1692208qcx.6 for ; Tue, 25 Mar 2014 09:57:38 -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=lDTTz6tqf1ZoOmCwIgVE7zaaD6RZdqDCrU4xc+lqFNk=; b=IHlzND09RzVtB51TXR49IstJyY+3aaEl30+ahEHJGIaZBY3T38xu0oOn8xN9h3CBVH lT6xP9xwVs5wg7MptFZBvkmAf0pGVw0zugbKGetWPAAJ9h9oZG6Njp0dmrrFe+dRcv+z hfQjIF0qVwDZxmo4d1T5h/efBRFHVyo+MFnCSt482Lo7b1rJXOhjqT4sun8SLf5+asmk nNmoxiLHdwp1DZWa+4gJ8fHok7Qu0z47xTeG0DHBXYArO5LP+VkHmjxGImDiEVbT5b8r 8akd1pJHEOtGSoHxaoTnjbWrFbP8kHOnWE4c/LN79Gpm3hy/wnTGyOouZ9/IA1f7sFcQ Oj7Q== X-Gm-Message-State: ALoCoQkEVs8kJ+Mqqr/TWVQKmnC/ySEJ/TN30vWuwa5YCDzjVYc93UgqgR9D6gmLPwfCjAUl+MsA X-Received: by 10.58.46.204 with SMTP id x12mr20059088vem.19.1395766658843; Tue, 25 Mar 2014 09:57:38 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.85 with SMTP id o79ls308018qgd.12.gmail; Tue, 25 Mar 2014 09:57:38 -0700 (PDT) X-Received: by 10.58.111.163 with SMTP id ij3mr1988652veb.26.1395766658772; Tue, 25 Mar 2014 09:57:38 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id yv5si3859901veb.188.2014.03.25.09.57.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Mar 2014 09:57:38 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.175 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.175; Received: by mail-vc0-f175.google.com with SMTP id lh14so915403vcb.6 for ; Tue, 25 Mar 2014 09:57:38 -0700 (PDT) X-Received: by 10.52.135.132 with SMTP id ps4mr15311452vdb.2.1395766658686; Tue, 25 Mar 2014 09:57:38 -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 i9csp320336vck; Tue, 25 Mar 2014 09:57:38 -0700 (PDT) X-Received: by 10.224.11.132 with SMTP id t4mr37026164qat.4.1395766657096; Tue, 25 Mar 2014 09:57:37 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id s10si3233127qak.152.2014.03.25.09.57.36 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 25 Mar 2014 09:57:37 -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 1WSUeH-0000Bi-Rv; Tue, 25 Mar 2014 16:56:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSUeG-00008w-Bd for xen-devel@lists.xenproject.org; Tue, 25 Mar 2014 16:56:24 +0000 Received: from [85.158.143.35:5910] by server-1.bemta-4.messagelabs.com id B6/4F-09853-735B1335; Tue, 25 Mar 2014 16:56:23 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-3.tower-21.messagelabs.com!1395766582!4656535!1 X-Originating-IP: [74.125.83.43] 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 10391 invoked from network); 25 Mar 2014 16:56:22 -0000 Received: from mail-ee0-f43.google.com (HELO mail-ee0-f43.google.com) (74.125.83.43) by server-3.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 25 Mar 2014 16:56:22 -0000 Received: by mail-ee0-f43.google.com with SMTP id e53so689532eek.2 for ; Tue, 25 Mar 2014 09:56:22 -0700 (PDT) X-Received: by 10.15.44.3 with SMTP id y3mr3883508eev.58.1395766582531; Tue, 25 Mar 2014 09:56:22 -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.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Mar 2014 09:56:21 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 25 Mar 2014 16:55:23 +0000 Message-Id: <1395766541-23979-17-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 16/34] xen/arm: Guard correctly asm-arm/platforms/midway.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.175 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/midway.h:1:9: error: '__ASM_ARM_PLATFORMS_MIDWAY_H' is used as a header guard here, followed by #define of a different macro [-Werror,-Wheader-guard] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ xen/include/asm/platforms/midway.h:2:9: note: '__ASM_ASM_PLATFORMS_MIDWAY_H' is defined here; did you mean '__ASM_ARM_PLATFORMS_MIDWAY_H'? ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ __ASM_ARM_PLATFORMS_MIDWAY_H Signed-off-by: Julien Grall Cc: Ian Campbell Cc: Stefano Stabellini Cc: Tim Deegan Acked-by: Ian Campbell --- xen/include/asm-arm/platforms/midway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-arm/platforms/midway.h b/xen/include/asm-arm/platforms/midway.h index 099e435..6914393 100644 --- a/xen/include/asm-arm/platforms/midway.h +++ b/xen/include/asm-arm/platforms/midway.h @@ -1,5 +1,5 @@ #ifndef __ASM_ARM_PLATFORMS_MIDWAY_H -#define __ASM_ASM_PLATFORMS_MIDWAY_H +#define __ASM_ARM_PLATFORMS_MIDWAY_H /* addresses of SREG registers for resetting the SoC */ #define MW_SREG_PWR_REQ 0xfff3cf00