[MIPS] Clean up asm-mips/mach-generic/spaces.h

PAGE_OFFSET definition is now using CAC_BASE by default.

This patch also reorder some macros to make them appear
in the same order for both 32 and 64 bits configs.

It also makes use of const.h generic header file to
annotate constants.

Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 27 insertions, 38 deletions

diff --git a/include/asm-mips/mach-generic/spaces.h b/include/asm-mips/mach-generic/spaces.h
index 9a3c521047b8..d901e084a479 100644
--- a/include/asm-mips/mach-generic/spaces.h
+++ b/include/asm-mips/mach-generic/spaces.h
@@ -10,74 +10,56 @@
 #ifndef _ASM_MACH_GENERIC_SPACES_H
 #define _ASM_MACH_GENERIC_SPACES_H
 
+#include <linux/const.h>
 
 #ifdef CONFIG_32BIT
 
-#define CAC_BASE                0x80000000
-#define IO_BASE                 0xa0000000
-#define UNCAC_BASE              0xa0000000
+#define CAC_BASE                _AC(0x80000000, UL)
+#define IO_BASE                 _AC(0xa0000000, UL)
+#define UNCAC_BASE              _AC(0xa0000000, UL)
 
 #ifndef MAP_BASE
-#define MAP_BASE                0xc0000000
-#endif
-
-/*
- * This handles the memory map.
- * We handle pages at KSEG0 for kernels with 32 bit address space.
- */
-#ifndef PAGE_OFFSET
-#define PAGE_OFFSET             0x80000000UL
+#define MAP_BASE                _AC(0xc0000000, UL)
 #endif
 
 /*
  * Memory above this physical address will be considered highmem.
  */
 #ifndef HIGHMEM_START
-#define HIGHMEM_START           0x20000000UL
+#define HIGHMEM_START           _AC(0x20000000, UL)
 #endif
 
 #endif /* CONFIG_32BIT */
 
 #ifdef CONFIG_64BIT
 
-/*
- * This handles the memory map.
- */
-#ifndef PAGE_OFFSET
-#ifdef CONFIG_DMA_NONCOHERENT
-#define PAGE_OFFSET     0x9800000000000000UL
-#else
-#define PAGE_OFFSET     0xa800000000000000UL
-#endif
-#endif
-
-/*
- * Memory above this physical address will be considered highmem.
- * Fixme: 59 bits is a fictive number and makes assumptions about processors
- * in the distant future.  Nobody will care for a few years :-)
- */
-#ifndef HIGHMEM_START
-#define HIGHMEM_START           (1UL << 59UL)
-#endif
-
 #ifndef CAC_BASE
 #ifdef CONFIG_DMA_NONCOHERENT
-#define CAC_BASE                0x9800000000000000UL
+#define CAC_BASE                _AC(0x9800000000000000, UL)
 #else
-#define CAC_BASE                0xa800000000000000UL
+#define CAC_BASE                _AC(0xa800000000000000, UL)
 #endif
 #endif
 
 #ifndef IO_BASE
-#define IO_BASE                 0x9000000000000000UL
+#define IO_BASE                 _AC(0x9000000000000000, UL)
 #endif
 
 #ifndef UNCAC_BASE
-#define UNCAC_BASE              0x9000000000000000UL
+#define UNCAC_BASE              _AC(0x9000000000000000, UL)
 #endif
 
 #ifndef MAP_BASE
-#define MAP_BASE                0xc000000000000000UL
+#define MAP_BASE                _AC(0xc000000000000000, UL)
+#endif
+
+/*
+ * Memory above this physical address will be considered highmem.
+ * Fixme: 59 bits is a fictive number and makes assumptions about processors
+ * in the distant future.  Nobody will care for a few years :-)
+ */
+#ifndef HIGHMEM_START
+#define HIGHMEM_START           (_AC(1, UL) << _AC(59, UL))
 #endif
 
 #define TO_PHYS(x)              (             ((x) & TO_PHYS_MASK))
@@ -86,4 +68,11 @@
 
 #endif /* CONFIG_64BIT */
 
+/*
+ * This handles the memory map.
+ */
+#ifndef PAGE_OFFSET
+#define PAGE_OFFSET             CAC_BASE
+#endif
+
 #endif /* __ASM_MACH_GENERIC_SPACES_H */