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

[MIPS] Ensure that ST0_FR is never set on a 32 bit kernel 



Signed-off-by: default avatarChris Dearman <chris@mips.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 4037500e

arch/mips/kernel/process.c

+1 −2
Original line number Diff line number Diff line
@@ -77,9 +77,8 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp) 
	unsigned long status;



	/* New thread loses kernel privileges. */

	status = regs->cp0_status & ~(ST0_CU0|ST0_CU1|KU_MASK);

	status = regs->cp0_status & ~(ST0_CU0|ST0_CU1|ST0_FR|KU_MASK);

#ifdef CONFIG_64BIT

	status &= ~ST0_FR;

	status |= test_thread_flag(TIF_32BIT_REGS) ? 0 : ST0_FR;

#endif

	status |= KU_USER;

arch/mips/kernel/traps.c

+3 −3
Original line number Diff line number Diff line
@@ -1317,12 +1317,12 @@ void __init per_cpu_trap_init(void) 
#endif

	if (current_cpu_data.isa_level == MIPS_CPU_ISA_IV)

		status_set |= ST0_XX;

	if (cpu_has_dsp)

		status_set |= ST0_MX;



	change_c0_status(ST0_CU|ST0_MX|ST0_RE|ST0_FR|ST0_BEV|ST0_TS|ST0_KX|ST0_SX|ST0_UX,

			 status_set);



	if (cpu_has_dsp)

		set_c0_status(ST0_MX);



#ifdef CONFIG_CPU_MIPSR2

	if (cpu_has_mips_r2) {

		unsigned int enable = 0x0000000f;