xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] xen/x86: Remove GB macro in asm-x86/config.h
@ 2013-10-08 16:48 Julien Grall
  2013-10-08 16:49 ` Andrew Cooper
  0 siblings, 1 reply; 4+ messages in thread
From: Julien Grall @ 2013-10-08 16:48 UTC (permalink / raw)
  To: xen-devel
  Cc: Keir Fraser, ian.campbell, patches, Andrew Cooper, Julien Grall,
	Jan Beulich

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 <julien.grall@linaro.org>
CC: Keir Fraser <keir@xen.org>
CC: Jan Beulich <jbeulich@suse.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
---
 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:
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] xen/x86: Remove GB macro in asm-x86/config.h
  2013-10-08 16:48 [PATCH] xen/x86: Remove GB macro in asm-x86/config.h Julien Grall
@ 2013-10-08 16:49 ` Andrew Cooper
  2013-10-08 17:11   ` Ian Campbell
  0 siblings, 1 reply; 4+ messages in thread
From: Andrew Cooper @ 2013-10-08 16:49 UTC (permalink / raw)
  To: Julien Grall; +Cc: patches, Keir Fraser, ian.campbell, Jan Beulich, xen-devel

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 <julien.grall@linaro.org>
> CC: Keir Fraser <keir@xen.org>
> CC: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
> ---
>  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:

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] xen/x86: Remove GB macro in asm-x86/config.h
  2013-10-08 16:49 ` Andrew Cooper
@ 2013-10-08 17:11   ` Ian Campbell
  2013-10-08 17:15     ` Keir Fraser
  0 siblings, 1 reply; 4+ messages in thread
From: Ian Campbell @ 2013-10-08 17:11 UTC (permalink / raw)
  To: Andrew Cooper; +Cc: Julien Grall, Keir Fraser, Jan Beulich, patches, xen-devel

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 <julien.grall@linaro.org>
> > CC: Keir Fraser <keir@xen.org>
> > CC: Jan Beulich <jbeulich@suse.com>
> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

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?)

> > ---
> >  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:
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] xen/x86: Remove GB macro in asm-x86/config.h
  2013-10-08 17:11   ` Ian Campbell
@ 2013-10-08 17:15     ` Keir Fraser
  0 siblings, 0 replies; 4+ messages in thread
From: Keir Fraser @ 2013-10-08 17:15 UTC (permalink / raw)
  To: Ian Campbell, Andrew Cooper; +Cc: Julien Grall, Jan Beulich, patches, xen-devel

On 08/10/2013 18:11, "Ian Campbell" <ian.campbell@citrix.com> 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 <julien.grall@linaro.org>
>>> CC: Keir Fraser <keir@xen.org>
>>> CC: Jan Beulich <jbeulich@suse.com>
>> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
> 
> 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:
>> 
> 
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-10-08 17:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-08 16:48 [PATCH] xen/x86: Remove GB macro in asm-x86/config.h Julien Grall
2013-10-08 16:49 ` Andrew Cooper
2013-10-08 17:11   ` Ian Campbell
2013-10-08 17:15     ` Keir Fraser

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).