Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 421a8ddd authored by Alex Shi's avatar Alex Shi
Browse files

Merge tag 'v3.18.29' into linux-linaro-lsk-v3.18 

 This is the 3.18.29 stable release
parents 82211c83 d439e869

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 28

SUBLEVEL = 29

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/kvm/guest.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static int get_timer_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) 
	u64 val;



	val = kvm_arm_timer_get_reg(vcpu, reg->id);

	return copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id));

	return copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id)) ? -EFAULT : 0;

}



static unsigned long num_core_regs(void)

arch/arm64/kernel/suspend.c

+10 −0
Original line number Diff line number Diff line 
#include <linux/ftrace.h>

#include <linux/percpu.h>

#include <linux/slab.h>

#include <asm/cacheflush.h>
@@ -91,6 +92,13 @@ int __cpu_suspend(unsigned long arg, int (*fn)(unsigned long)) 
	 */

	local_dbg_save(flags);



	/*

	 * Function graph tracer state gets incosistent when the kernel

	 * calls functions that never return (aka suspend finishers) hence

	 * disable graph tracing during their execution.

	 */

	pause_graph_tracing();



	/*

	 * mm context saved on the stack, it will be restored when

	 * the cpu comes out of reset through the identity mapped
@@ -128,6 +136,8 @@ int __cpu_suspend(unsigned long arg, int (*fn)(unsigned long)) 
			hw_breakpoint_restore(NULL);

	}



	unpause_graph_tracing();



	/*

	 * Restore pstate flags. OS lock and mdscr have been already

	 * restored, so from this point onwards, debugging is fully

arch/arm64/kvm/guest.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static int get_timer_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) 
	u64 val;



	val = kvm_arm_timer_get_reg(vcpu, reg->id);

	return copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id));

	return copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id)) ? -EFAULT : 0;

}



/**

arch/mips/kernel/traps.c

+6 −7
Original line number Diff line number Diff line
@@ -692,15 +692,15 @@ static int simulate_sync(struct pt_regs *regs, unsigned int opcode) 
asmlinkage void do_ov(struct pt_regs *regs)

{

	enum ctx_state prev_state;

	siginfo_t info;

	siginfo_t info = {

		.si_signo = SIGFPE,

		.si_code = FPE_INTOVF,

		.si_addr = (void __user *)regs->cp0_epc,

	};



	prev_state = exception_enter();

	die_if_kernel("Integer overflow", regs);



	info.si_code = FPE_INTOVF;

	info.si_signo = SIGFPE;

	info.si_errno = 0;

	info.si_addr = (void __user *) regs->cp0_epc;

	force_sig_info(SIGFPE, &info, current);

	exception_exit(prev_state);

}
@@ -803,7 +803,7 @@ out: 
static void do_trap_or_bp(struct pt_regs *regs, unsigned int code,

	const char *str)

{

	siginfo_t info;

	siginfo_t info = { 0 };

	char b[40];



#ifdef CONFIG_KGDB_LOW_LEVEL_TRAP
@@ -831,7 +831,6 @@ static void do_trap_or_bp(struct pt_regs *regs, unsigned int code, 
		else

			info.si_code = FPE_INTOVF;

		info.si_signo = SIGFPE;

		info.si_errno = 0;

		info.si_addr = (void __user *) regs->cp0_epc;

		force_sig_info(SIGFPE, &info, current);

		break;