aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r--arch/mips/kernel/cpu-probe.c6
-rw-r--r--arch/mips/kernel/gdb-low.S2
-rw-r--r--arch/mips/kernel/signal-common.h10
-rw-r--r--arch/mips/kernel/signal32.c10
-rw-r--r--arch/mips/kernel/traps.c2
5 files changed, 15 insertions, 15 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 292f8b243a5e..58b3b14873cb 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -291,7 +291,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
291 * for documentation. Commented out because it shares 291 * for documentation. Commented out because it shares
292 * it's c0_prid id number with the TX3900. 292 * it's c0_prid id number with the TX3900.
293 */ 293 */
294 c->cputype = CPU_R4650; 294 c->cputype = CPU_R4650;
295 c->isa_level = MIPS_CPU_ISA_III; 295 c->isa_level = MIPS_CPU_ISA_III;
296 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_LLSC; 296 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_LLSC;
297 c->tlbsize = 48; 297 c->tlbsize = 48;
@@ -604,7 +604,7 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c)
604 case PRID_IMP_AU1_REV2: 604 case PRID_IMP_AU1_REV2:
605 switch ((c->processor_id >> 24) & 0xff) { 605 switch ((c->processor_id >> 24) & 0xff) {
606 case 0: 606 case 0:
607 c->cputype = CPU_AU1000; 607 c->cputype = CPU_AU1000;
608 break; 608 break;
609 case 1: 609 case 1:
610 c->cputype = CPU_AU1500; 610 c->cputype = CPU_AU1500;
@@ -705,7 +705,7 @@ __init void cpu_probe(void)
705 break; 705 break;
706 case PRID_COMP_PHILIPS: 706 case PRID_COMP_PHILIPS:
707 cpu_probe_philips(c); 707 cpu_probe_philips(c);
708 break; 708 break;
709 default: 709 default:
710 c->cputype = CPU_UNKNOWN; 710 c->cputype = CPU_UNKNOWN;
711 } 711 }
diff --git a/arch/mips/kernel/gdb-low.S b/arch/mips/kernel/gdb-low.S
index 83b8986f9401..235ad9f6bd35 100644
--- a/arch/mips/kernel/gdb-low.S
+++ b/arch/mips/kernel/gdb-low.S
@@ -41,7 +41,7 @@
41 */ 41 */
42 .align 5 42 .align 5
43 NESTED(trap_low, GDB_FR_SIZE, sp) 43 NESTED(trap_low, GDB_FR_SIZE, sp)
44 .set noat 44 .set noat
45 .set noreorder 45 .set noreorder
46 46
47 mfc0 k0, CP0_STATUS 47 mfc0 k0, CP0_STATUS
diff --git a/arch/mips/kernel/signal-common.h b/arch/mips/kernel/signal-common.h
index 36bfc2588aa3..3ca786215d48 100644
--- a/arch/mips/kernel/signal-common.h
+++ b/arch/mips/kernel/signal-common.h
@@ -166,11 +166,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
166 sp = regs->regs[29]; 166 sp = regs->regs[29];
167 167
168 /* 168 /*
169 * FPU emulator may have it's own trampoline active just 169 * FPU emulator may have it's own trampoline active just
170 * above the user stack, 16-bytes before the next lowest 170 * above the user stack, 16-bytes before the next lowest
171 * 16 byte boundary. Try to avoid trashing it. 171 * 16 byte boundary. Try to avoid trashing it.
172 */ 172 */
173 sp -= 32; 173 sp -= 32;
174 174
175 /* This is the X/Open sanctioned signal stack switching. */ 175 /* This is the X/Open sanctioned signal stack switching. */
176 if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags (sp) == 0)) 176 if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags (sp) == 0))
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index 1c7241ba6924..f32a22997c3d 100644
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -624,11 +624,11 @@ static inline void __user *get_sigframe(struct k_sigaction *ka,
624 sp = regs->regs[29]; 624 sp = regs->regs[29];
625 625
626 /* 626 /*
627 * FPU emulator may have it's own trampoline active just 627 * FPU emulator may have it's own trampoline active just
628 * above the user stack, 16-bytes before the next lowest 628 * above the user stack, 16-bytes before the next lowest
629 * 16 byte boundary. Try to avoid trashing it. 629 * 16 byte boundary. Try to avoid trashing it.
630 */ 630 */
631 sp -= 32; 631 sp -= 32;
632 632
633 /* This is the X/Open sanctioned signal stack switching. */ 633 /* This is the X/Open sanctioned signal stack switching. */
634 if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags (sp) == 0)) 634 if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags (sp) == 0))
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 005debbfbe84..bed0eb6cf55d 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -576,7 +576,7 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
576 } 576 }
577#endif 577#endif
578 /* 578 /*
579 * Unimplemented operation exception. If we've got the full 579 * Unimplemented operation exception. If we've got the full
580 * software emulator on-board, let's use it... 580 * software emulator on-board, let's use it...
581 * 581 *
582 * Force FPU to dump state into task/thread context. We're 582 * Force FPU to dump state into task/thread context. We're