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

Commit 2e67ba55 authored by Alex Shi's avatar Alex Shi
Browse files

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

 This is the 3.18.45 stable release
parents e5dd309b ac3d826b

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 44

SUBLEVEL = 45

EXTRAVERSION =

NAME = Diseased Newt
@@ -610,6 +610,8 @@ all: vmlinux 
include $(srctree)/arch/$(SRCARCH)/Makefile



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

KBUILD_CFLAGS	+= $(call cc-option,-fno-PIE)

KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= -Os $(call cc-disable-warning,maybe-uninitialized,)

arch/mips/kvm/emulate.c

+4 −4
Original line number Diff line number Diff line
@@ -752,15 +752,15 @@ enum emulation_result kvm_mips_emul_eret(struct kvm_vcpu *vcpu) 
	struct mips_coproc *cop0 = vcpu->arch.cop0;

	enum emulation_result er = EMULATE_DONE;



	if (kvm_read_c0_guest_status(cop0) & ST0_EXL) {

	if (kvm_read_c0_guest_status(cop0) & ST0_ERL) {

		kvm_clear_c0_guest_status(cop0, ST0_ERL);

		vcpu->arch.pc = kvm_read_c0_guest_errorepc(cop0);

	} else if (kvm_read_c0_guest_status(cop0) & ST0_EXL) {

		kvm_debug("[%#lx] ERET to %#lx\n", vcpu->arch.pc,

			  kvm_read_c0_guest_epc(cop0));

		kvm_clear_c0_guest_status(cop0, ST0_EXL);

		vcpu->arch.pc = kvm_read_c0_guest_epc(cop0);



	} else if (kvm_read_c0_guest_status(cop0) & ST0_ERL) {

		kvm_clear_c0_guest_status(cop0, ST0_ERL);

		vcpu->arch.pc = kvm_read_c0_guest_errorepc(cop0);

	} else {

		kvm_err("[%#lx] ERET when MIPS_SR_EXL|MIPS_SR_ERL == 0\n",

			vcpu->arch.pc);

arch/parisc/kernel/syscall.S

+9 −2
Original line number Diff line number Diff line
@@ -106,8 +106,6 @@ linux_gateway_entry: 
	mtsp	%r0,%sr4			/* get kernel space into sr4 */

	mtsp	%r0,%sr5			/* get kernel space into sr5 */

	mtsp	%r0,%sr6			/* get kernel space into sr6 */

	mfsp    %sr7,%r1                        /* save user sr7 */

	mtsp    %r1,%sr3                        /* and store it in sr3 */



#ifdef CONFIG_64BIT

	/* for now we can *always* set the W bit on entry to the syscall
@@ -133,6 +131,14 @@ linux_gateway_entry: 
	depdi	0, 31, 32, %r21

1:	

#endif



	/* We use a rsm/ssm pair to prevent sr3 from being clobbered

	 * by external interrupts.

	 */

	mfsp    %sr7,%r1                        /* save user sr7 */

	rsm	PSW_SM_I, %r0			/* disable interrupts */

	mtsp    %r1,%sr3                        /* and store it in sr3 */



	mfctl   %cr30,%r1

	xor     %r1,%r30,%r30                   /* ye olde xor trick */

	xor     %r1,%r30,%r1
@@ -147,6 +153,7 @@ linux_gateway_entry: 
	 */



	mtsp	%r0,%sr7			/* get kernel space into sr7 */

	ssm	PSW_SM_I, %r0			/* enable interrupts */

	STREGM	%r1,FRAME_SIZE(%r30)		/* save r1 (usp) here for now */

	mfctl	%cr30,%r1			/* get task ptr in %r1 */

	LDREG	TI_TASK(%r1),%r1

arch/powerpc/kernel/idle_power7.S

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
	std	r0,0(r1);					\

	ptesync;						\

	ld	r0,0(r1);					\

1:	cmp	cr0,r0,r0;					\

1:	cmpd	cr0,r0,r0;					\

	bne	1b;						\

	IDLE_INST;						\

	b	.

arch/powerpc/mm/copro_fault.c

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ int copro_calculate_slb(struct mm_struct *mm, u64 ea, struct copro_slb *slb) 
	switch (REGION_ID(ea)) {

	case USER_REGION_ID:

		pr_devel("%s: 0x%llx -- USER_REGION_ID\n", __func__, ea);

		if (mm == NULL)

			return 1;

		psize = get_slice_psize(mm, ea);

		ssize = user_segment_size(ea);

		vsid = get_vsid(mm->context.id, ea, ssize);