Merge branch 'upstream-linux-4.4.y' into android-4.4 (837de638) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/kernel-parameters.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -1261,6 +1261,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		When zero, profiling data is discarded and associated
		debugfs files are removed at module unload time.

		goldfish [X86] Enable the goldfish android emulator platform.
		Don't use this when you are not running on the
		android emulator

		gpt [EFI] Forces disk with valid GPT signature but
		invalid Protective MBR to be treated as GPT. If the
		primary GPT is corrupted, it enables the backup/alternate

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 49
		SUBLEVEL = 52
		EXTRAVERSION =
		NAME = Blurry Fish Butt

arch/arm/lib/getuser.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ ENTRY(__get_user_4)
		ENDPROC(__get_user_4)

		ENTRY(__get_user_8)
		check_uaccess r0, 8, r1, r2, __get_user_bad
		check_uaccess r0, 8, r1, r2, __get_user_bad8
		#ifdef CONFIG_THUMB2_KERNEL
		5: TUSER(ldr) r2, [r0]
		6: TUSER(ldr) r3, [r0, #4]

arch/x86/kvm/vmx.c

+24 −32

Original line number	Diff line number	Diff line
		@@ -4867,6 +4867,12 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx)
		if (vmx_xsaves_supported())
		vmcs_write64(XSS_EXIT_BITMAP, VMX_XSS_EXIT_BITMAP);

		if (enable_pml) {
		ASSERT(vmx->pml_pg);
		vmcs_write64(PML_ADDRESS, page_to_phys(vmx->pml_pg));
		vmcs_write16(GUEST_PML_INDEX, PML_ENTITY_NUM - 1);
		}

		return 0;
		}

		@@ -7839,22 +7845,6 @@ static void vmx_get_exit_info(struct kvm_vcpu vcpu, u64 info1, u64 *info2)
		*info2 = vmcs_read32(VM_EXIT_INTR_INFO);
		}

		static int vmx_create_pml_buffer(struct vcpu_vmx *vmx)
		{
		struct page *pml_pg;

		pml_pg = alloc_page(GFP_KERNEL \| __GFP_ZERO);
		if (!pml_pg)
		return -ENOMEM;

		vmx->pml_pg = pml_pg;

		vmcs_write64(PML_ADDRESS, page_to_phys(vmx->pml_pg));
		vmcs_write16(GUEST_PML_INDEX, PML_ENTITY_NUM - 1);

		return 0;
		}

		static void vmx_destroy_pml_buffer(struct vcpu_vmx *vmx)
		{
		if (vmx->pml_pg) {
		@@ -8789,14 +8779,26 @@ static struct kvm_vcpu vmx_create_vcpu(struct kvm kvm, unsigned int id)
		if (err)
		goto free_vcpu;

		err = -ENOMEM;

		/*
		* If PML is turned on, failure on enabling PML just results in failure
		* of creating the vcpu, therefore we can simplify PML logic (by
		* avoiding dealing with cases, such as enabling PML partially on vcpus
		* for the guest, etc.
		*/
		if (enable_pml) {
		vmx->pml_pg = alloc_page(GFP_KERNEL \| __GFP_ZERO);
		if (!vmx->pml_pg)
		goto uninit_vcpu;
		}

		vmx->guest_msrs = kmalloc(PAGE_SIZE, GFP_KERNEL);
		BUILD_BUG_ON(ARRAY_SIZE(vmx_msr_index) * sizeof(vmx->guest_msrs[0])
		> PAGE_SIZE);

		err = -ENOMEM;
		if (!vmx->guest_msrs) {
		goto uninit_vcpu;
		}
		if (!vmx->guest_msrs)
		goto free_pml;

		vmx->loaded_vmcs = &vmx->vmcs01;
		vmx->loaded_vmcs->vmcs = alloc_vmcs();
		@@ -8840,18 +8842,6 @@ static struct kvm_vcpu vmx_create_vcpu(struct kvm kvm, unsigned int id)
		vmx->nested.current_vmptr = -1ull;
		vmx->nested.current_vmcs12 = NULL;

		/*
		* If PML is turned on, failure on enabling PML just results in failure
		* of creating the vcpu, therefore we can simplify PML logic (by
		* avoiding dealing with cases, such as enabling PML partially on vcpus
		* for the guest, etc.
		*/
		if (enable_pml) {
		err = vmx_create_pml_buffer(vmx);
		if (err)
		goto free_vmcs;
		}

		return &vmx->vcpu;

		free_vmcs:
		@@ -8859,6 +8849,8 @@ free_vmcs:
		free_loaded_vmcs(vmx->loaded_vmcs);
		free_msrs:
		kfree(vmx->guest_msrs);
		free_pml:
		vmx_destroy_pml_buffer(vmx);
		uninit_vcpu:
		kvm_vcpu_uninit(&vmx->vcpu);
		free_vcpu:

arch/x86/platform/goldfish/goldfish.c

+13 −1

Original line number	Diff line number	Diff line
		@@ -42,8 +42,20 @@ static struct resource goldfish_pdev_bus_resources[] = {
		}
		};

		static bool goldfish_enable __initdata;

		static int __init goldfish_setup(char *str)
		{
		goldfish_enable = true;
		return 0;
		}
		__setup("goldfish", goldfish_setup);

		static int __init goldfish_init(void)
		{
		if (!goldfish_enable)
		return -ENODEV;

		platform_device_register_simple("goldfish_pdev_bus", -1,
		goldfish_pdev_bus_resources, 2);
		return 0;