Commit ec917c2c authored by Ralf Baechle's avatar Ralf Baechle
Browse files

Fixup a few lose ends in explicit support for MIPS R1/R2. 


    
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent f92c1759

arch/mips/kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ obj-$(CONFIG_CPU_RM9000) += r4k_fpu.o r4k_switch.o 
obj-$(CONFIG_CPU_NEVADA)	+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_R10000)	+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_SB1)		+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_MIPS32_R1)	+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_MIPS64_R1)	+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_MIPS32)	+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_MIPS64)	+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_R6000)		+= r6000_fpu.o r4k_switch.o



obj-$(CONFIG_SMP)		+= smp.o

arch/mips/kernel/r4k_switch.S

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ LEAF(_init_fpu) 
1:

#endif



#ifdef CONFIG_CPU_MIPS32_R1

#ifdef CONFIG_CPU_MIPS32

	mtc1	t1, $f0

	mtc1	t1, $f1

	mtc1	t1, $f2

arch/mips/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -885,7 +885,7 @@ asmlinkage void cache_parity_error(void) 
	       reg_val & (1<<22) ? "E0 " : "");

	printk("IDX: 0x%08x\n", reg_val & ((1<<22)-1));



#if defined(CONFIG_CPU_MIPS32_R1) || defined(CONFIG_CPU_MIPS64_R1)

#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)

	if (reg_val & (1<<22))

		printk("DErrAddr0: 0x%0*lx\n", field, read_c0_derraddr0());

arch/mips/lib-32/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 


lib-y	+= csum_partial.o memset.o watch.o



obj-$(CONFIG_CPU_MIPS32_R1)	+= dump_tlb.o

obj-$(CONFIG_CPU_MIPS64_R1)	+= dump_tlb.o

obj-$(CONFIG_CPU_MIPS32)	+= dump_tlb.o

obj-$(CONFIG_CPU_MIPS64)	+= dump_tlb.o

obj-$(CONFIG_CPU_NEVADA)	+= dump_tlb.o

obj-$(CONFIG_CPU_R10000)	+= dump_tlb.o

obj-$(CONFIG_CPU_R3000)		+= r3k_dump_tlb.o

arch/mips/lib-64/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 


lib-y	+= csum_partial.o memset.o watch.o



obj-$(CONFIG_CPU_MIPS32_R1)	+= dump_tlb.o

obj-$(CONFIG_CPU_MIPS64_R1)	+= dump_tlb.o

obj-$(CONFIG_CPU_MIPS32)	+= dump_tlb.o

obj-$(CONFIG_CPU_MIPS64)	+= dump_tlb.o

obj-$(CONFIG_CPU_NEVADA)	+= dump_tlb.o

obj-$(CONFIG_CPU_R10000)	+= dump_tlb.o

obj-$(CONFIG_CPU_R3000)		+= r3k_dump_tlb.o