| Message ID | 1381250913-15913-1-git-send-email-julien.grall@linaro.org |
|---|---|
| State | Accepted, archived |
| Headers | show |
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:
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: >
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: >> > >
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:
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(-)