Commit c620953c authored by Chris Dearman's avatar Chris Dearman Committed by Ralf Baechle
Browse files

[MIPS] Fix detection and handling of the 74K processor. 


    
Nothing exciting; Linux just didn't know it yet so this is most adding
a value to a case statement.
    
Signed-off-by: default avatarChris Dearman <chris@mips.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 98a41de9

arch/mips/kernel/cpu-probe.c

+4 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ static inline void check_wait(void) 
	case CPU_24K:

	case CPU_25KF:

	case CPU_34K:

	case CPU_74K:

 	case CPU_PR4450:

		cpu_wait = r4k_wait;

		printk(" available.\n");
@@ -593,6 +594,9 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c) 
	case PRID_IMP_34K:

		c->cputype = CPU_34K;

		break;

	case PRID_IMP_74K:

		c->cputype = CPU_74K;

		break;

	}

}

arch/mips/kernel/proc.c

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ static const char *cpu_name[] = { 
	[CPU_24K]	= "MIPS 24K",

	[CPU_25KF]	= "MIPS 25Kf",

	[CPU_34K]	= "MIPS 34K",

	[CPU_74K]	= "MIPS 74K",

	[CPU_VR4111]	= "NEC VR4111",

	[CPU_VR4121]	= "NEC VR4121",

	[CPU_VR4122]	= "NEC VR4122",

arch/mips/mm/tlbex.c

+1 −0
Original line number Diff line number Diff line
@@ -906,6 +906,7 @@ static __init void build_tlb_write_entry(u32 **p, struct label **l, 
	case CPU_4KEC:

	case CPU_24K:

	case CPU_34K:

	case CPU_74K:

		i_ehb(p);

		tlbw(p);

		break;

arch/mips/oprofile/common.c

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) 
	case CPU_24K:

	case CPU_25KF:

	case CPU_34K:

	case CPU_74K:

	case CPU_SB1:

	case CPU_SB1A:

		lmodel = &op_model_mipsxx;

arch/mips/oprofile/op_model_mipsxx.c

+4 −0
Original line number Diff line number Diff line
@@ -205,6 +205,10 @@ static int __init mipsxx_init(void) 
	case CPU_34K:

		op_model_mipsxx.cpu_type = "mips/34K";

		break;



	case CPU_74K:

		op_model_mipsxx.cpu_type = "mips/74K";

		break;

#endif



	case CPU_5KC: