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

Commit 82eaa958 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch 'remotes/origin/tmp-faeb94c0' into msm-4.14"

parents e0cc40a5 3d139549

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 16

SUBLEVEL = 17

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/boot/dts/bcm-nsp.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
		timer@20200 {

			compatible = "arm,cortex-a9-global-timer";

			reg = <0x20200 0x100>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;

			clocks = <&periph_clk>;

		};
@@ -93,7 +93,7 @@ 
			compatible = "arm,cortex-a9-twd-timer";

			reg = <0x20600 0x20>;

			interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |

						  IRQ_TYPE_LEVEL_HIGH)>;

						  IRQ_TYPE_EDGE_RISING)>;

			clocks = <&periph_clk>;

		};

arch/arm/boot/dts/bcm958623hr.dts

+0 −4
Original line number Diff line number Diff line
@@ -141,10 +141,6 @@ 
	status = "okay";

};



&sata {

	status = "okay";

};



&qspi {

	bspi-sel = <0>;

	flash: m25p80@0 {

arch/arm/boot/dts/bcm958625hr.dts

+0 −4
Original line number Diff line number Diff line
@@ -177,10 +177,6 @@ 
	status = "okay";

};



&sata {

	status = "okay";

};



&srab {

	compatible = "brcm,bcm58625-srab", "brcm,nsp-srab";

	status = "okay";

arch/mips/kvm/mips.c

+2 −5
Original line number Diff line number Diff line
@@ -445,10 +445,8 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, 
int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)

{

	int r = -EINTR;

	sigset_t sigsaved;



	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);

	kvm_sigset_activate(vcpu);



	if (vcpu->mmio_needed) {

		if (!vcpu->mmio_is_write)
@@ -480,8 +478,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	local_irq_enable();



out:

	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &sigsaved, NULL);

	kvm_sigset_deactivate(vcpu);



	return r;

}