Commit a0911976 authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.14.y' into rpi-4.14.y

parents f9cbf9d7 d2dd9f15

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 90

SUBLEVEL = 91

EXTRAVERSION =

NAME = Petit Gorille

arch/x86/include/asm/msr-index.h

+1 −0
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ 
#define MSR_F15H_NB_PERF_CTR		0xc0010241

#define MSR_F15H_PTSC			0xc0010280

#define MSR_F15H_IC_CFG			0xc0011021

#define MSR_F15H_EX_CFG			0xc001102c



/* Fam 10h MSRs */

#define MSR_FAM10H_MMIO_CONF_BASE	0xc0010058

arch/x86/kernel/cpu/mtrr/if.c

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,8 @@ mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg) 
	struct mtrr_gentry gentry;

	void __user *arg = (void __user *) __arg;



	memset(&gentry, 0, sizeof(gentry));



	switch (cmd) {

	case MTRRIOC_ADD_ENTRY:

	case MTRRIOC_SET_ENTRY:

arch/x86/kvm/vmx.c

+2 −0
Original line number Diff line number Diff line
@@ -10447,6 +10447,8 @@ static void nested_get_vmcs12_pages(struct kvm_vcpu *vcpu, 
			kunmap(vmx->nested.pi_desc_page);

			kvm_release_page_dirty(vmx->nested.pi_desc_page);

			vmx->nested.pi_desc_page = NULL;

			vmx->nested.pi_desc = NULL;

			vmcs_write64(POSTED_INTR_DESC_ADDR, -1ull);

		}

		page = kvm_vcpu_gpa_to_page(vcpu, vmcs12->posted_intr_desc_addr);

		if (is_error_page(page))

arch/x86/kvm/x86.c

+2 −0
Original line number Diff line number Diff line
@@ -2227,6 +2227,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
	case MSR_AMD64_PATCH_LOADER:

	case MSR_AMD64_BU_CFG2:

	case MSR_AMD64_DC_CFG:

	case MSR_F15H_EX_CFG:

		break;



	case MSR_IA32_UCODE_REV:
@@ -2508,6 +2509,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
	case MSR_AMD64_BU_CFG2:

	case MSR_IA32_PERF_CTL:

	case MSR_AMD64_DC_CFG:

	case MSR_F15H_EX_CFG:

		msr_info->data = 0;

		break;

	case MSR_K7_EVNTSEL0 ... MSR_K7_EVNTSEL3: