diff options
author | Tony Wu <tung7970@gmail.com> | 2013-06-21 06:10:46 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-07-01 09:10:57 -0400 |
commit | fc192e50f868d8f34b15a18c38407f4b9468a31d (patch) | |
tree | 98cc6a85cf581af6967cf3f6e087b433bab55b45 | |
parent | 4df715aaf566110bedb3751ed235a3bacdebbdde (diff) |
MIPS: Cleanup indentation and whitespace
Signed-off-by: Tony Wu <tung7970@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5536/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/include/asm/cpu-features.h | 32 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-generic/kernel-entry-init.h | 4 | ||||
-rw-r--r-- | arch/mips/include/asm/processor.h | 4 | ||||
-rw-r--r-- | arch/mips/kernel/branch.c | 1 | ||||
-rw-r--r-- | arch/mips/kernel/unaligned.c | 1 | ||||
-rw-r--r-- | arch/mips/mm/page.c | 2 |
6 files changed, 22 insertions, 22 deletions
diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h index 8e0c125c59a1..1dc086087a72 100644 --- a/arch/mips/include/asm/cpu-features.h +++ b/arch/mips/include/asm/cpu-features.h | |||
@@ -97,13 +97,13 @@ | |||
97 | #define cpu_has_mips16 (cpu_data[0].ases & MIPS_ASE_MIPS16) | 97 | #define cpu_has_mips16 (cpu_data[0].ases & MIPS_ASE_MIPS16) |
98 | #endif | 98 | #endif |
99 | #ifndef cpu_has_mdmx | 99 | #ifndef cpu_has_mdmx |
100 | #define cpu_has_mdmx (cpu_data[0].ases & MIPS_ASE_MDMX) | 100 | #define cpu_has_mdmx (cpu_data[0].ases & MIPS_ASE_MDMX) |
101 | #endif | 101 | #endif |
102 | #ifndef cpu_has_mips3d | 102 | #ifndef cpu_has_mips3d |
103 | #define cpu_has_mips3d (cpu_data[0].ases & MIPS_ASE_MIPS3D) | 103 | #define cpu_has_mips3d (cpu_data[0].ases & MIPS_ASE_MIPS3D) |
104 | #endif | 104 | #endif |
105 | #ifndef cpu_has_smartmips | 105 | #ifndef cpu_has_smartmips |
106 | #define cpu_has_smartmips (cpu_data[0].ases & MIPS_ASE_SMARTMIPS) | 106 | #define cpu_has_smartmips (cpu_data[0].ases & MIPS_ASE_SMARTMIPS) |
107 | #endif | 107 | #endif |
108 | #ifndef cpu_has_rixi | 108 | #ifndef cpu_has_rixi |
109 | #define cpu_has_rixi (cpu_data[0].options & MIPS_CPU_RIXI) | 109 | #define cpu_has_rixi (cpu_data[0].options & MIPS_CPU_RIXI) |
@@ -125,7 +125,7 @@ | |||
125 | #define cpu_has_ic_fills_f_dc (cpu_data[0].icache.flags & MIPS_CACHE_IC_F_DC) | 125 | #define cpu_has_ic_fills_f_dc (cpu_data[0].icache.flags & MIPS_CACHE_IC_F_DC) |
126 | #endif | 126 | #endif |
127 | #ifndef cpu_has_pindexed_dcache | 127 | #ifndef cpu_has_pindexed_dcache |
128 | #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX) | 128 | #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX) |
129 | #endif | 129 | #endif |
130 | #ifndef cpu_has_local_ebase | 130 | #ifndef cpu_has_local_ebase |
131 | #define cpu_has_local_ebase 1 | 131 | #define cpu_has_local_ebase 1 |
@@ -162,18 +162,18 @@ | |||
162 | #ifndef cpu_has_mips_5 | 162 | #ifndef cpu_has_mips_5 |
163 | # define cpu_has_mips_5 (cpu_data[0].isa_level & MIPS_CPU_ISA_V) | 163 | # define cpu_has_mips_5 (cpu_data[0].isa_level & MIPS_CPU_ISA_V) |
164 | #endif | 164 | #endif |
165 | # ifndef cpu_has_mips32r1 | 165 | #ifndef cpu_has_mips32r1 |
166 | # define cpu_has_mips32r1 (cpu_data[0].isa_level & MIPS_CPU_ISA_M32R1) | 166 | # define cpu_has_mips32r1 (cpu_data[0].isa_level & MIPS_CPU_ISA_M32R1) |
167 | # endif | 167 | #endif |
168 | # ifndef cpu_has_mips32r2 | 168 | #ifndef cpu_has_mips32r2 |
169 | # define cpu_has_mips32r2 (cpu_data[0].isa_level & MIPS_CPU_ISA_M32R2) | 169 | # define cpu_has_mips32r2 (cpu_data[0].isa_level & MIPS_CPU_ISA_M32R2) |
170 | # endif | 170 | #endif |
171 | # ifndef cpu_has_mips64r1 | 171 | #ifndef cpu_has_mips64r1 |
172 | # define cpu_has_mips64r1 (cpu_data[0].isa_level & MIPS_CPU_ISA_M64R1) | 172 | # define cpu_has_mips64r1 (cpu_data[0].isa_level & MIPS_CPU_ISA_M64R1) |
173 | # endif | 173 | #endif |
174 | # ifndef cpu_has_mips64r2 | 174 | #ifndef cpu_has_mips64r2 |
175 | # define cpu_has_mips64r2 (cpu_data[0].isa_level & MIPS_CPU_ISA_M64R2) | 175 | # define cpu_has_mips64r2 (cpu_data[0].isa_level & MIPS_CPU_ISA_M64R2) |
176 | # endif | 176 | #endif |
177 | 177 | ||
178 | /* | 178 | /* |
179 | * Shortcuts ... | 179 | * Shortcuts ... |
@@ -195,9 +195,9 @@ | |||
195 | * has CLO and CLZ but not DCLO nor DCLZ. For 64-bit kernels | 195 | * has CLO and CLZ but not DCLO nor DCLZ. For 64-bit kernels |
196 | * cpu_has_clo_clz also indicates the availability of DCLO and DCLZ. | 196 | * cpu_has_clo_clz also indicates the availability of DCLO and DCLZ. |
197 | */ | 197 | */ |
198 | # ifndef cpu_has_clo_clz | 198 | #ifndef cpu_has_clo_clz |
199 | # define cpu_has_clo_clz cpu_has_mips_r | 199 | #define cpu_has_clo_clz cpu_has_mips_r |
200 | # endif | 200 | #endif |
201 | 201 | ||
202 | #ifndef cpu_has_dsp | 202 | #ifndef cpu_has_dsp |
203 | #define cpu_has_dsp (cpu_data[0].ases & MIPS_ASE_DSP) | 203 | #define cpu_has_dsp (cpu_data[0].ases & MIPS_ASE_DSP) |
@@ -223,7 +223,7 @@ | |||
223 | # define cpu_has_64bits (cpu_data[0].isa_level & MIPS_CPU_ISA_64BIT) | 223 | # define cpu_has_64bits (cpu_data[0].isa_level & MIPS_CPU_ISA_64BIT) |
224 | # endif | 224 | # endif |
225 | # ifndef cpu_has_64bit_zero_reg | 225 | # ifndef cpu_has_64bit_zero_reg |
226 | # define cpu_has_64bit_zero_reg (cpu_data[0].isa_level & MIPS_CPU_ISA_64BIT) | 226 | # define cpu_has_64bit_zero_reg (cpu_data[0].isa_level & MIPS_CPU_ISA_64BIT) |
227 | # endif | 227 | # endif |
228 | # ifndef cpu_has_64bit_gp_regs | 228 | # ifndef cpu_has_64bit_gp_regs |
229 | # define cpu_has_64bit_gp_regs 0 | 229 | # define cpu_has_64bit_gp_regs 0 |
diff --git a/arch/mips/include/asm/mach-generic/kernel-entry-init.h b/arch/mips/include/asm/mach-generic/kernel-entry-init.h index 7e66505fa574..13b0751b010a 100644 --- a/arch/mips/include/asm/mach-generic/kernel-entry-init.h +++ b/arch/mips/include/asm/mach-generic/kernel-entry-init.h | |||
@@ -12,8 +12,8 @@ | |||
12 | /* Intentionally empty macro, used in head.S. Override in | 12 | /* Intentionally empty macro, used in head.S. Override in |
13 | * arch/mips/mach-xxx/kernel-entry-init.h when necessary. | 13 | * arch/mips/mach-xxx/kernel-entry-init.h when necessary. |
14 | */ | 14 | */ |
15 | .macro kernel_entry_setup | 15 | .macro kernel_entry_setup |
16 | .endm | 16 | .endm |
17 | 17 | ||
18 | /* | 18 | /* |
19 | * Do SMP slave processor setup necessary before we can savely execute C code. | 19 | * Do SMP slave processor setup necessary before we can savely execute C code. |
diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h index 016dc4bffc80..3605b844ad87 100644 --- a/arch/mips/include/asm/processor.h +++ b/arch/mips/include/asm/processor.h | |||
@@ -244,8 +244,8 @@ struct thread_struct { | |||
244 | unsigned long cp0_baduaddr; /* Last kernel fault accessing USEG */ | 244 | unsigned long cp0_baduaddr; /* Last kernel fault accessing USEG */ |
245 | unsigned long error_code; | 245 | unsigned long error_code; |
246 | #ifdef CONFIG_CPU_CAVIUM_OCTEON | 246 | #ifdef CONFIG_CPU_CAVIUM_OCTEON |
247 | struct octeon_cop2_state cp2 __attribute__ ((__aligned__(128))); | 247 | struct octeon_cop2_state cp2 __attribute__ ((__aligned__(128))); |
248 | struct octeon_cvmseg_state cvmseg __attribute__ ((__aligned__(128))); | 248 | struct octeon_cvmseg_state cvmseg __attribute__ ((__aligned__(128))); |
249 | #endif | 249 | #endif |
250 | #ifdef CONFIG_CPU_XLP | 250 | #ifdef CONFIG_CPU_XLP |
251 | struct nlm_cop2_state cp2; | 251 | struct nlm_cop2_state cp2; |
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index 46c2ad0703a0..4d78bf445a9c 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c | |||
@@ -467,5 +467,4 @@ unaligned: | |||
467 | printk("%s: unaligned epc - sending SIGBUS.\n", current->comm); | 467 | printk("%s: unaligned epc - sending SIGBUS.\n", current->comm); |
468 | force_sig(SIGBUS, current); | 468 | force_sig(SIGBUS, current); |
469 | return -EFAULT; | 469 | return -EFAULT; |
470 | |||
471 | } | 470 | } |
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c index 3eaa02aa8ae0..8eaf310ffc6c 100644 --- a/arch/mips/kernel/unaligned.c +++ b/arch/mips/kernel/unaligned.c | |||
@@ -1549,6 +1549,7 @@ sigill: | |||
1549 | ("Unhandled kernel unaligned access or invalid instruction", regs); | 1549 | ("Unhandled kernel unaligned access or invalid instruction", regs); |
1550 | force_sig(SIGILL, current); | 1550 | force_sig(SIGILL, current); |
1551 | } | 1551 | } |
1552 | |||
1552 | asmlinkage void do_ade(struct pt_regs *regs) | 1553 | asmlinkage void do_ade(struct pt_regs *regs) |
1553 | { | 1554 | { |
1554 | enum ctx_state prev_state; | 1555 | enum ctx_state prev_state; |
diff --git a/arch/mips/mm/page.c b/arch/mips/mm/page.c index 4eb8dcfaf1ce..2c0bd580b9da 100644 --- a/arch/mips/mm/page.c +++ b/arch/mips/mm/page.c | |||
@@ -232,7 +232,7 @@ static inline void __cpuinit build_clear_pref(u32 **buf, int off) | |||
232 | 232 | ||
233 | uasm_i_cache(buf, Create_Dirty_Excl_D, off, A0); | 233 | uasm_i_cache(buf, Create_Dirty_Excl_D, off, A0); |
234 | } | 234 | } |
235 | } | 235 | } |
236 | } | 236 | } |
237 | 237 | ||
238 | extern u32 __clear_page_start; | 238 | extern u32 __clear_page_start; |