From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keir Fraser Subject: Re: [PATCH] xen/x86: Remove GB macro in asm-x86/config.h Date: Tue, 08 Oct 2013 18:15:43 +0100 Message-ID: References: <1381252274.3804.97.camel@hastur.hellion.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1381252274.3804.97.camel@hastur.hellion.org.uk> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell , Andrew Cooper Cc: Julien Grall , Jan Beulich , patches@linaro.org, xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On 08/10/2013 18:11, "Ian Campbell" wrote: > On Tue, 2013-10-08 at 17:49 +0100, Andrew Cooper wrote: >> On 08/10/13 17:48, Julien Grall wrote: >>> 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 >> Reviewed-by: Andrew Cooper > > Since Keir acked the patch I was supposed to have applied I have applied > this without waiting. > > BTW, the original patch didn't cause an actual build failure in > practice, I don't know why not... (does cpp perhaps not whine if the > duplicate definitions are identical?) Yeah, cpp accepts exact duplicates ime. >>> --- >>> 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: >> > >