diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-09-25 10:49:49 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-09-27 08:37:57 -0400 |
commit | 36396f3c36b04f79438f87a0fccfa76aa3de6af9 (patch) | |
tree | 2e9e26d7ace9005502014a1e624a34792f5be925 /include | |
parent | e584ade1a6679bfb417620f15951796bed9805d9 (diff) |
[MIPS] s/__ASSEMBLER__/__ASSEMBLY__/ for clarity sake.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-mips/hazards.h | 2 | ||||
-rw-r--r-- | include/asm-mips/mach-excite/excite.h | 2 | ||||
-rw-r--r-- | include/asm-mips/sibyte/sb1250_defs.h | 6 | ||||
-rw-r--r-- | include/asm-mips/sibyte/sb1250_scd.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-mips/hazards.h b/include/asm-mips/hazards.h index bf0b80404946..0fe02945feba 100644 --- a/include/asm-mips/hazards.h +++ b/include/asm-mips/hazards.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #define _ASM_HAZARDS_H | 11 | #define _ASM_HAZARDS_H |
12 | 12 | ||
13 | 13 | ||
14 | #ifdef __ASSEMBLER__ | 14 | #ifdef __ASSEMBLY__ |
15 | #define ASMMACRO(name, code...) .macro name; code; .endm | 15 | #define ASMMACRO(name, code...) .macro name; code; .endm |
16 | #else | 16 | #else |
17 | 17 | ||
diff --git a/include/asm-mips/mach-excite/excite.h b/include/asm-mips/mach-excite/excite.h index 130bd4b8edce..4c29ba44992c 100644 --- a/include/asm-mips/mach-excite/excite.h +++ b/include/asm-mips/mach-excite/excite.h | |||
@@ -7,7 +7,7 @@ | |||
7 | 7 | ||
8 | #define EXCITE_CPU_EXT_CLOCK 100000000 | 8 | #define EXCITE_CPU_EXT_CLOCK 100000000 |
9 | 9 | ||
10 | #if !defined(__ASSEMBLER__) | 10 | #if !defined(__ASSEMBLY__) |
11 | void __init excite_kgdb_init(void); | 11 | void __init excite_kgdb_init(void); |
12 | void excite_procfs_init(void); | 12 | void excite_procfs_init(void); |
13 | extern unsigned long memsize; | 13 | extern unsigned long memsize; |
diff --git a/include/asm-mips/sibyte/sb1250_defs.h b/include/asm-mips/sibyte/sb1250_defs.h index 335dbaf1d831..a885491217c1 100644 --- a/include/asm-mips/sibyte/sb1250_defs.h +++ b/include/asm-mips/sibyte/sb1250_defs.h | |||
@@ -212,7 +212,7 @@ | |||
212 | * Note: you'll need to define uint32_t and uint64_t in your headers. | 212 | * Note: you'll need to define uint32_t and uint64_t in your headers. |
213 | */ | 213 | */ |
214 | 214 | ||
215 | #if !defined(__ASSEMBLER__) | 215 | #if !defined(__ASSEMBLY__) |
216 | #define _SB_MAKE64(x) ((uint64_t)(x)) | 216 | #define _SB_MAKE64(x) ((uint64_t)(x)) |
217 | #define _SB_MAKE32(x) ((uint32_t)(x)) | 217 | #define _SB_MAKE32(x) ((uint32_t)(x)) |
218 | #else | 218 | #else |
@@ -251,9 +251,9 @@ | |||
251 | */ | 251 | */ |
252 | 252 | ||
253 | 253 | ||
254 | #if defined(__mips64) && !defined(__ASSEMBLER__) | 254 | #if defined(__mips64) && !defined(__ASSEMBLY__) |
255 | #define SBWRITECSR(csr,val) *((volatile uint64_t *) PHYS_TO_K1(csr)) = (val) | 255 | #define SBWRITECSR(csr,val) *((volatile uint64_t *) PHYS_TO_K1(csr)) = (val) |
256 | #define SBREADCSR(csr) (*((volatile uint64_t *) PHYS_TO_K1(csr))) | 256 | #define SBREADCSR(csr) (*((volatile uint64_t *) PHYS_TO_K1(csr))) |
257 | #endif /* __ASSEMBLER__ */ | 257 | #endif /* __ASSEMBLY__ */ |
258 | 258 | ||
259 | #endif | 259 | #endif |
diff --git a/include/asm-mips/sibyte/sb1250_scd.h b/include/asm-mips/sibyte/sb1250_scd.h index f4178bdcfcb0..7ed0bb611e56 100644 --- a/include/asm-mips/sibyte/sb1250_scd.h +++ b/include/asm-mips/sibyte/sb1250_scd.h | |||
@@ -149,7 +149,7 @@ | |||
149 | * (For the assembler version, sysrev and dest may be the same register. | 149 | * (For the assembler version, sysrev and dest may be the same register. |
150 | * Also, it clobbers AT.) | 150 | * Also, it clobbers AT.) |
151 | */ | 151 | */ |
152 | #ifdef __ASSEMBLER__ | 152 | #ifdef __ASSEMBLY__ |
153 | #define SYS_SOC_TYPE(dest, sysrev) \ | 153 | #define SYS_SOC_TYPE(dest, sysrev) \ |
154 | .set push ; \ | 154 | .set push ; \ |
155 | .set reorder ; \ | 155 | .set reorder ; \ |