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

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

Merge "Merge android-4.4.176 (cf84cdc1) into msm-4.4"

parents 52df3df9 567c084d

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 175

SUBLEVEL = 176

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/x86/kernel/livepatch.c

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ int klp_write_module_reloc(struct module *mod, unsigned long type, 
		val = (s32)value;

		break;

	case R_X86_64_PC32:

	case R_X86_64_PLT32:

		val = (u32)(value - loc);

		break;

	default:

arch/x86/kvm/vmx.c

+3 −1
Original line number Diff line number Diff line
@@ -4628,7 +4628,9 @@ static u8 vmx_msr_bitmap_mode(struct kvm_vcpu *vcpu) 
{

	u8 mode = 0;



	if (irqchip_in_kernel(vcpu->kvm) && apic_x2apic_mode(vcpu->arch.apic)) {

	if (cpu_has_secondary_exec_ctrls() &&

	    (vmcs_read32(SECONDARY_VM_EXEC_CONTROL) &

	     SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE)) {

		mode |= MSR_BITMAP_MODE_X2APIC;

		if (enable_apicv)

			mode |= MSR_BITMAP_MODE_X2APIC_APICV;

drivers/hwmon/lm80.c

+3 −1
Original line number Diff line number Diff line
@@ -393,8 +393,10 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr, 
	}



	rv = lm80_read_value(client, LM80_REG_FANDIV);

	if (rv < 0)

	if (rv < 0) {

		mutex_unlock(&data->update_lock);

		return rv;

	}

	reg = (rv & ~(3 << (2 * (nr + 1))))

	    | (data->fan_div[nr] << (2 * (nr + 1)));

	lm80_write_value(client, LM80_REG_FANDIV, reg);

drivers/isdn/mISDN/timerdev.c

+1 −1
Original line number Diff line number Diff line
@@ -168,8 +168,8 @@ dev_expire_timer(unsigned long data) 
	spin_lock_irqsave(&timer->dev->lock, flags);

	if (timer->id >= 0)

		list_move_tail(&timer->list, &timer->dev->expired);

	spin_unlock_irqrestore(&timer->dev->lock, flags);

	wake_up_interruptible(&timer->dev->wait);

	spin_unlock_irqrestore(&timer->dev->lock, flags);

}



static int