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

Commit c67d2358 authored by Alex Shi's avatar Alex Shi
Browse files

Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18 

Conflicts:
	include 666eeee7 include/linux/irq.h
	which used for pcie support
parents fe522b17 3cab355c

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 42

SUBLEVEL = 43

EXTRAVERSION =

NAME = Diseased Newt

arch/arc/include/asm/uaccess.h

+9 −2
Original line number Diff line number Diff line
@@ -83,7 +83,10 @@ 
	"2:	;nop\n"				\

	"	.section .fixup, \"ax\"\n"	\

	"	.align 4\n"			\

	"3:	mov %0, %3\n"			\

	"3:	# return -EFAULT\n"		\

	"	mov %0, %3\n"			\

	"	# zero out dst ptr\n"		\

	"	mov %1,  0\n"			\

	"	j   2b\n"			\

	"	.previous\n"			\

	"	.section __ex_table, \"a\"\n"	\
@@ -101,7 +104,11 @@ 
	"2:	;nop\n"				\

	"	.section .fixup, \"ax\"\n"	\

	"	.align 4\n"			\

	"3:	mov %0, %3\n"			\

	"3:	# return -EFAULT\n"		\

	"	mov %0, %3\n"			\

	"	# zero out dst ptr\n"		\

	"	mov %1,  0\n"			\

	"	mov %R1, 0\n"			\

	"	j   2b\n"			\

	"	.previous\n"			\

	"	.section __ex_table, \"a\"\n"	\

arch/arm/boot/dts/kirkwood-ib62x0.dts

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


	partition@e0000 {

		label = "u-boot environment";

		reg = <0xe0000 0x100000>;

		reg = <0xe0000 0x20000>;

	};



	partition@100000 {

arch/arm/kvm/arm.c

+0 −2
Original line number Diff line number Diff line
@@ -153,8 +153,6 @@ void kvm_arch_destroy_vm(struct kvm *kvm) 
{

	int i;



	kvm_free_stage2_pgd(kvm);



	for (i = 0; i < KVM_MAX_VCPUS; ++i) {

		if (kvm->vcpus[i]) {

			kvm_arch_vcpu_free(kvm->vcpus[i]);

arch/arm/kvm/mmu.c

+1 −0
Original line number Diff line number Diff line
@@ -1493,6 +1493,7 @@ void kvm_arch_memslots_updated(struct kvm *kvm) 


void kvm_arch_flush_shadow_all(struct kvm *kvm)

{

	kvm_free_stage2_pgd(kvm);

}



void kvm_arch_flush_shadow_memslot(struct kvm *kvm,