Message ID | 1466601669-25398-2-git-send-email-julien.grall@arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, 22 Jun 2016, Julien Grall wrote: > The macro _AC is used to define constant for both assembly and C. > > Signed-off-by: Julien Grall <julien.grall@arm.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > xen/include/asm-arm/config.h | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h > index 9417be6..a96f845 100644 > --- a/xen/include/asm-arm/config.h > +++ b/xen/include/asm-arm/config.h > @@ -176,12 +176,7 @@ > #define FIXMAP_ACPI_END (FIXMAP_ACPI_BEGIN + NUM_FIXMAP_ACPI_PAGES - 1) /* End mappings of ACPI tables */ > > #define PAGE_SHIFT 12 > - > -#ifndef __ASSEMBLY__ > -#define PAGE_SIZE (1L << PAGE_SHIFT) > -#else > -#define PAGE_SIZE (1 << PAGE_SHIFT) > -#endif > +#define PAGE_SIZE (_AC(1,L) << PAGE_SHIFT) > #define PAGE_MASK (~(PAGE_SIZE-1)) > #define PAGE_FLAG_MASK (~0) > > -- > 1.9.1 >
diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 9417be6..a96f845 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -176,12 +176,7 @@ #define FIXMAP_ACPI_END (FIXMAP_ACPI_BEGIN + NUM_FIXMAP_ACPI_PAGES - 1) /* End mappings of ACPI tables */ #define PAGE_SHIFT 12 - -#ifndef __ASSEMBLY__ -#define PAGE_SIZE (1L << PAGE_SHIFT) -#else -#define PAGE_SIZE (1 << PAGE_SHIFT) -#endif +#define PAGE_SIZE (_AC(1,L) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) #define PAGE_FLAG_MASK (~0)
The macro _AC is used to define constant for both assembly and C. Signed-off-by: Julien Grall <julien.grall@arm.com> --- xen/include/asm-arm/config.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)