From patchwork Tue Oct 8 16:48:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 20905 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 5A3F124697 for ; Tue, 8 Oct 2013 16:48:39 +0000 (UTC) Received: by mail-qc0-f200.google.com with SMTP id x20sf16917660qcv.3 for ; Tue, 08 Oct 2013 09:48:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=pS2sRYHdqO22w2IIreeXUiu7tAt01TkKBe1fJG5FprE=; b=KunDCF1ti3cNQoGrnPqNO0qE1smmBygFynEGKZZMzEr4ywTK176SKSs/dMMXdlRWnv m1LeJRsg7uSmq56/jeCJyUR1nm/CXXOibsZDLJnA4HA0b3vPeD5k2A0OHZ0ZqJyTw65E BFE5cJwiilSEgFsE2p37VJ5KgoNUFwixe4PAM8KB6MPeWzcTqmGjGgqW0zWUQvhxzxXU 9L4tV4sjyzI4oqdSIozx4rq7+6KpYIFSQGDbs2tH9e7IFVIVzfor87stxLnkVzMwPdoS aQW8zVTYL4+1mBhJ6KlsuQcdlJiWm4PFers5Oij653SsmHOhXBllZknhWVYI/3AN0gMS Drxw== X-Received: by 10.236.69.35 with SMTP id m23mr2357685yhd.6.1381250918497; Tue, 08 Oct 2013 09:48:38 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.99.10 with SMTP id em10ls350134qeb.82.gmail; Tue, 08 Oct 2013 09:48:38 -0700 (PDT) X-Received: by 10.220.199.5 with SMTP id eq5mr1750863vcb.16.1381250918396; Tue, 08 Oct 2013 09:48:38 -0700 (PDT) Received: from mail-vb0-f44.google.com (mail-vb0-f44.google.com [209.85.212.44]) by mx.google.com with ESMTPS id lr1si9866768vcb.19.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Oct 2013 09:48:38 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.44 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.44; Received: by mail-vb0-f44.google.com with SMTP id e13so4388969vbg.17 for ; Tue, 08 Oct 2013 09:48:38 -0700 (PDT) X-Gm-Message-State: ALoCoQmwPjkU3C9LmnYUW/2n2PfNZ3ozT9YKihLFv/N1HogdH40gvwV1+G2wcPjvWuKfzfaP1vo0 X-Received: by 10.221.6.195 with SMTP id ol3mr1353361vcb.34.1381250918296; Tue, 08 Oct 2013 09:48:38 -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 u4csp219740vcz; Tue, 8 Oct 2013 09:48:37 -0700 (PDT) X-Received: by 10.194.202.195 with SMTP id kk3mr2543355wjc.49.1381250916913; Tue, 08 Oct 2013 09:48:36 -0700 (PDT) Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by mx.google.com with ESMTPS id by8si14065746wjc.130.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Oct 2013 09:48:36 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.41 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=74.125.82.41; Received: by mail-wg0-f41.google.com with SMTP id l18so6689044wgh.0 for ; Tue, 08 Oct 2013 09:48:36 -0700 (PDT) X-Received: by 10.180.89.206 with SMTP id bq14mr2500740wib.56.1381250916270; Tue, 08 Oct 2013 09:48:36 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id b11sm6792422wik.1.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Oct 2013 09:48:35 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Cc: ian.campbell@citrix.com, patches@linaro.org, Julien Grall , Keir Fraser , Jan Beulich , Andrew Cooper Subject: [PATCH] xen/x86: Remove GB macro in asm-x86/config.h Date: Tue, 8 Oct 2013 17:48:33 +0100 Message-Id: <1381250913-15913-1-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 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.212.44 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: , Commit 983843e "xen: Add macros MB and GB" introduce a generic GB macro. By mistake, the macro in asm-x86/config.h was not removed. This is result to a compilation error when Xen is build for x86. Signed-off-by: Julien Grall CC: Keir Fraser CC: Jan Beulich CC: Andrew Cooper Reviewed-by: Andrew Cooper --- xen/include/asm-x86/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 3980e06..99d0e2c 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -129,7 +129,6 @@ extern unsigned char boot_edid_info[128]; #define PML4_ADDR(_slot) \ (((_AC(_slot, UL) >> 8) * _AC(0xffff000000000000,UL)) | \ (_AC(_slot, UL) << PML4_ENTRY_BITS)) -#define GB(_gb) (_AC(_gb, UL) << 30) /* * Memory layout: