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

Commit 324e88de authored by Dmitry Shmidt's avatar Dmitry Shmidt
Browse files

Merge tag 'v4.4.32' into android-4.4.y 

This is the 4.4.32 stable release

Change-Id: I5028402eadfcf055ac44a5e67abc6da75b2068b3
parents 93e33369 4dab3e4d

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 30

SUBLEVEL = 32

EXTRAVERSION =

NAME = Blurry Fish Butt
@@ -617,6 +617,7 @@ include arch/$(SRCARCH)/Makefile 


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

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

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



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= -Os

arch/arm/include/asm/floppy.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


#define fd_outb(val,port)			\

	do {					\

		if ((port) == FD_DOR)		\

		if ((port) == (u32)FD_DOR)	\

			fd_setdor((val));	\

		else				\

			outb((val),(port));	\

arch/h8300/include/asm/thread_info.h

+0 −4
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ struct thread_info { 
	int		   cpu;			/* cpu we're on */

	int		   preempt_count;	/* 0 => preemptable, <0 => BUG */

	mm_segment_t		addr_limit;

	struct restart_block restart_block;

};



/*
@@ -44,9 +43,6 @@ struct thread_info { 
	.cpu =		0,			\

	.preempt_count = INIT_PREEMPT_COUNT,	\

	.addr_limit	= KERNEL_DS,		\

	.restart_block	= {			\

		.fn = do_no_restart_syscall,	\

	},					\

}



#define init_thread_info	(init_thread_union.thread_info)

arch/h8300/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ restore_sigcontext(struct sigcontext *usc, int *pd0) 
	unsigned int er0;



	/* Always make any pending restarted system calls return -EINTR */

	current_thread_info()->restart_block.fn = do_no_restart_syscall;

	current->restart_block.fn = do_no_restart_syscall;



	/* restore passed registers */

#define COPY(r)  do { err |= get_user(regs->r, &usc->sc_##r); } while (0)

arch/mips/kvm/emulate.c

+5 −5
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);
@@ -822,7 +822,7 @@ static void kvm_mips_invalidate_guest_tlb(struct kvm_vcpu *vcpu, 
	bool user;



	/* No need to flush for entries which are already invalid */

	if (!((tlb->tlb_lo[0] | tlb->tlb_lo[1]) & ENTRYLO_V))

	if (!((tlb->tlb_lo0 | tlb->tlb_lo1) & MIPS3_PG_V))

		return;

	/* User address space doesn't need flushing for KSeg2/3 changes */

	user = tlb->tlb_hi < KVM_GUEST_KSEG0;