| Message ID | 5245BAC6.7040108@linaro.org |
|---|---|
| State | Accepted, archived |
| Headers | show |
On 27/09/13 18:05, Julien Grall wrote: > On 09/27/2013 06:01 PM, Andrew Cooper wrote: >> On 27/09/13 17:56, Julien Grall wrote: >>> Signed-off-by: Julien Grall <julien.grall@linaro.org> >>> CC: Keir Fraser <keir@xen.org> >>> CC: Jan Beulich <jbeulich@suse.com> >>> >>> --- >>> Changes in v3: >>> - Add GB >>> - Move to common code (include/xen/config.h) >>> --- >>> xen/include/asm-arm/config.h | 1 - >>> xen/include/xen/config.h | 3 +++ >>> 2 files changed, 3 insertions(+), 1 deletion(-) >> You will also need to delete GB() from xen/include/asm-x86/config.h for >> this to compile. > Thanks, I forget to check the compilation on x86. > I only resend this patch: > > commit 466457ed4946f7e1ec45f55e6d601a75b84884e5 > Author: Julien Grall <julien.grall@linaro.org> > Date: Thu Sep 26 13:26:40 2013 +0100 > > xen: Add macros MB and GB > > Signed-off-by: Julien Grall <julien.grall@linaro.org> > CC: Keir Fraser <keir@xen.org> > CC: Jan Beulich <jbeulich@suse.com> That looks better. Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com> > > --- > Changes in v4: > - Remove GB in asm-x86/config.h > > Changes in v3: > - Add GB > - Move to common code (include/xen/config.h) > > diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h > index 9e395c2..5b7b1a8 100644 > --- a/xen/include/asm-arm/config.h > +++ b/xen/include/asm-arm/config.h > @@ -142,7 +142,6 @@ > #define SLOT0_ENTRY_BITS 39 > #define SLOT0(slot) (_AT(vaddr_t,slot) << SLOT0_ENTRY_BITS) > #define SLOT0_ENTRY_SIZE SLOT0(1) > -#define GB(_gb) (_AC(_gb, UL) << 30) > > #define VMAP_VIRT_START GB(1) > #define VMAP_VIRT_END (VMAP_VIRT_START + GB(1) - 1) > diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h > index cc42a88..3749457 100644 > --- a/xen/include/asm-x86/config.h > +++ b/xen/include/asm-x86/config.h > @@ -128,7 +128,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/xen/config.h b/xen/include/xen/config.h > index a52298e..657c6e5 100644 > --- a/xen/include/xen/config.h > +++ b/xen/include/xen/config.h > @@ -69,6 +69,9 @@ > #define __force > #define __bitwise > > +#define MB(_mb) (_AC(_mb, UL) << 20) > +#define GB(_gb) (_AC(_gb, UL) << 30) > + > #ifndef __ASSEMBLY__ > > int current_domain_id(void); >
diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 9e395c2..5b7b1a8 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -142,7 +142,6 @@ #define SLOT0_ENTRY_BITS 39 #define SLOT0(slot) (_AT(vaddr_t,slot) << SLOT0_ENTRY_BITS) #define SLOT0_ENTRY_SIZE SLOT0(1) -#define GB(_gb) (_AC(_gb, UL) << 30) #define VMAP_VIRT_START GB(1) #define VMAP_VIRT_END (VMAP_VIRT_START + GB(1) - 1) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index cc42a88..3749457 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -128,7 +128,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/xen/config.h b/xen/include/xen/config.h index a52298e..657c6e5 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -69,6 +69,9 @@ #define __force #define __bitwise +#define MB(_mb) (_AC(_mb, UL) << 20) +#define GB(_gb) (_AC(_gb, UL) << 30) + #ifndef __ASSEMBLY__ int current_domain_id(void);