Message ID | 132be102-33ab-a70a-217b-7dbbecbca9be@gentoo.org (mailing list archive) |
---|---|
State | Mainlined |
Commit | 83dd9a0b664397209a11849c47f9a59901af4da9 |
Headers | show |
Series | MIPS: SGI-IP27: Use the _AC() macro in spaces.h | expand |
On Thu, May 14, 2020 at 11:24:22PM -0400, Joshua Kinard wrote: > From: Joshua Kinard <kumba@gentoo.org> > > The attached patch wraps several of the macros in IP27's spaces.h > header file with the _AC() macro. This matches most of the other > spaces.h files in the MIPS tree. > > Signed-off-by: Joshua Kinard <kumba@gentoo.org> > --- > arch/mips/include/asm/mach-ip27/spaces.h | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) applied to mips-next. Thomas.
diff --git a/arch/mips/include/asm/mach-ip27/spaces.h b/arch/mips/include/asm/mach-ip27/spaces.h index 24d5e31bcfa6..66421e9a6aa6 100644 --- a/arch/mips/include/asm/mach-ip27/spaces.h +++ b/arch/mips/include/asm/mach-ip27/spaces.h @@ -10,17 +10,19 @@ #ifndef _ASM_MACH_IP27_SPACES_H #define _ASM_MACH_IP27_SPACES_H +#include <linux/const.h> + /* * IP27 uses the R10000's uncached attribute feature. Attribute 3 selects * uncached memory addressing. Hide the definitions on 32-bit compilation * of the compat-vdso code. */ #ifdef CONFIG_64BIT -#define HSPEC_BASE 0x9000000000000000 -#define IO_BASE 0x9200000000000000 -#define MSPEC_BASE 0x9400000000000000 -#define UNCAC_BASE 0x9600000000000000 -#define CAC_BASE 0xa800000000000000 +#define HSPEC_BASE _AC(0x9000000000000000, UL) +#define IO_BASE _AC(0x9200000000000000, UL) +#define MSPEC_BASE _AC(0x9400000000000000, UL) +#define UNCAC_BASE _AC(0x9600000000000000, UL) +#define CAC_BASE _AC(0xa800000000000000, UL) #endif #define TO_MSPEC(x) (MSPEC_BASE | ((x) & TO_PHYS_MASK))