Commit 2e6aa171 authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y

parents b9f2f5bd efcfbfb1

Makefile

+4 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 39

SUBLEVEL = 40

EXTRAVERSION =

NAME = Roaring Lionus
@@ -629,6 +629,9 @@ include arch/$(SRCARCH)/Makefile 


KBUILD_CFLAGS	+= $(call cc-option,-fno-delete-null-pointer-checks,)

KBUILD_CFLAGS	+= $(call cc-disable-warning,frame-address,)

KBUILD_CFLAGS	+= $(call cc-disable-warning, format-truncation)

KBUILD_CFLAGS	+= $(call cc-disable-warning, format-overflow)

KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)



ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION

KBUILD_CFLAGS	+= $(call cc-option,-ffunction-sections,)

arch/mips/include/asm/branch.h

+1 −4
Original line number Diff line number Diff line
@@ -74,10 +74,7 @@ static inline int compute_return_epc(struct pt_regs *regs) 
			return __microMIPS_compute_return_epc(regs);

		if (cpu_has_mips16)

			return __MIPS16e_compute_return_epc(regs);

		return regs->cp0_epc;

	}



	if (!delay_slot(regs)) {

	} else if (!delay_slot(regs)) {

		regs->cp0_epc += 4;

		return 0;

	}

arch/mips/kernel/branch.c

+32 −39
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ int __MIPS16e_compute_return_epc(struct pt_regs *regs) 
 *

 * @regs:	Pointer to pt_regs

 * @insn:	branch instruction to decode

 * @returns:	-EFAULT on error and forces SIGBUS, and on success

 * @returns:	-EFAULT on error and forces SIGILL, and on success

 *		returns 0 or BRANCH_LIKELY_TAKEN as appropriate after

 *		evaluating the branch.

 *
@@ -431,7 +431,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 
			/* Fall through */

		case jr_op:

			if (NO_R6EMU && insn.r_format.func == jr_op)

				goto sigill_r6;

				goto sigill_r2r6;

			regs->cp0_epc = regs->regs[insn.r_format.rs];

			break;

		}
@@ -446,7 +446,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 
		switch (insn.i_format.rt) {

		case bltzl_op:

			if (NO_R6EMU)

				goto sigill_r6;

				goto sigill_r2r6;

		case bltz_op:

			if ((long)regs->regs[insn.i_format.rs] < 0) {

				epc = epc + 4 + (insn.i_format.simmediate << 2);
@@ -459,7 +459,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 


		case bgezl_op:

			if (NO_R6EMU)

				goto sigill_r6;

				goto sigill_r2r6;

		case bgez_op:

			if ((long)regs->regs[insn.i_format.rs] >= 0) {

				epc = epc + 4 + (insn.i_format.simmediate << 2);
@@ -473,10 +473,8 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 
		case bltzal_op:

		case bltzall_op:

			if (NO_R6EMU && (insn.i_format.rs ||

			    insn.i_format.rt == bltzall_op)) {

				ret = -SIGILL;

				break;

			}

			    insn.i_format.rt == bltzall_op))

				goto sigill_r2r6;

			regs->regs[31] = epc + 8;

			/*

			 * OK we are here either because we hit a NAL
@@ -507,10 +505,8 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 
		case bgezal_op:

		case bgezall_op:

			if (NO_R6EMU && (insn.i_format.rs ||

			    insn.i_format.rt == bgezall_op)) {

				ret = -SIGILL;

				break;

			}

			    insn.i_format.rt == bgezall_op))

				goto sigill_r2r6;

			regs->regs[31] = epc + 8;

			/*

			 * OK we are here either because we hit a BAL
@@ -556,6 +552,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 
	/*

	 * These are unconditional and in j_format.

	 */

	case jalx_op:

	case jal_op:

		regs->regs[31] = regs->cp0_epc + 8;

	case j_op:
@@ -573,7 +570,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 
	 */

	case beql_op:

		if (NO_R6EMU)

			goto sigill_r6;

			goto sigill_r2r6;

	case beq_op:

		if (regs->regs[insn.i_format.rs] ==

		    regs->regs[insn.i_format.rt]) {
@@ -587,7 +584,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 


	case bnel_op:

		if (NO_R6EMU)

			goto sigill_r6;

			goto sigill_r2r6;

	case bne_op:

		if (regs->regs[insn.i_format.rs] !=

		    regs->regs[insn.i_format.rt]) {
@@ -601,7 +598,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 


	case blezl_op: /* not really i_format */

		if (!insn.i_format.rt && NO_R6EMU)

			goto sigill_r6;

			goto sigill_r2r6;

	case blez_op:

		/*

		 * Compact branches for R6 for the
@@ -636,7 +633,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 


	case bgtzl_op:

		if (!insn.i_format.rt && NO_R6EMU)

			goto sigill_r6;

			goto sigill_r2r6;

	case bgtz_op:

		/*

		 * Compact branches for R6 for the
@@ -774,35 +771,27 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 
#else

	case bc6_op:

		/* Only valid for MIPS R6 */

		if (!cpu_has_mips_r6) {

			ret = -SIGILL;

			break;

		}

		if (!cpu_has_mips_r6)

			goto sigill_r6;

		regs->cp0_epc += 8;

		break;

	case balc6_op:

		if (!cpu_has_mips_r6) {

			ret = -SIGILL;

			break;

		}

		if (!cpu_has_mips_r6)

			goto sigill_r6;

		/* Compact branch: BALC */

		regs->regs[31] = epc + 4;

		epc += 4 + (insn.i_format.simmediate << 2);

		regs->cp0_epc = epc;

		break;

	case pop66_op:

		if (!cpu_has_mips_r6) {

			ret = -SIGILL;

			break;

		}

		if (!cpu_has_mips_r6)

			goto sigill_r6;

		/* Compact branch: BEQZC || JIC */

		regs->cp0_epc += 8;

		break;

	case pop76_op:

		if (!cpu_has_mips_r6) {

			ret = -SIGILL;

			break;

		}

		if (!cpu_has_mips_r6)

			goto sigill_r6;

		/* Compact branch: BNEZC || JIALC */

		if (!insn.i_format.rs) {

			/* JIALC: set $31/ra */
@@ -814,10 +803,8 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 
	case pop10_op:

	case pop30_op:

		/* Only valid for MIPS R6 */

		if (!cpu_has_mips_r6) {

			ret = -SIGILL;

			break;

		}

		if (!cpu_has_mips_r6)

			goto sigill_r6;

		/*

		 * Compact branches:

		 * bovc, beqc, beqzalc, bnvc, bnec, bnezlac
@@ -831,11 +818,17 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 
	return ret;



sigill_dsp:

	printk("%s: DSP branch but not DSP ASE - sending SIGBUS.\n", current->comm);

	force_sig(SIGBUS, current);

	pr_info("%s: DSP branch but not DSP ASE - sending SIGILL.\n",

		current->comm);

	force_sig(SIGILL, current);

	return -EFAULT;

sigill_r2r6:

	pr_info("%s: R2 branch but r2-to-r6 emulator is not present - sending SIGILL.\n",

		current->comm);

	force_sig(SIGILL, current);

	return -EFAULT;

sigill_r6:

	pr_info("%s: R2 branch but r2-to-r6 emulator is not preset - sending SIGILL.\n",

	pr_info("%s: R6 branch but no MIPSr6 ISA support - sending SIGILL.\n",

		current->comm);

	force_sig(SIGILL, current);

	return -EFAULT;

arch/mips/kernel/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
	}



	seq_printf(m, "isa\t\t\t:"); 

	if (cpu_has_mips_r1)

	if (cpu_has_mips_1)

		seq_printf(m, " mips1");

	if (cpu_has_mips_2)

		seq_printf(m, "%s", " mips2");

arch/mips/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs) 
	audit_syscall_exit(regs);



	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))

		trace_sys_exit(regs, regs->regs[2]);

		trace_sys_exit(regs, regs_return_value(regs));



	if (test_thread_flag(TIF_SYSCALL_TRACE))

		tracehook_report_syscall_exit(regs, 0);