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

Commit 2809234d authored by Larry Finger's avatar Larry Finger
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

parents 2c1179af 76be97c1

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 36

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Sheep on Meth



# *DOCUMENTATION*

arch/x86/kernel/i387.c

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 


static unsigned int		mxcsr_feature_mask __read_mostly = 0xffffffffu;

unsigned int xstate_size;

EXPORT_SYMBOL_GPL(xstate_size);

unsigned int sig_xstate_ia32_size = sizeof(struct _fpstate_ia32);

static struct i387_fxsave_struct fx_scratch __cpuinitdata;

arch/x86/kvm/i8254.c

+2 −1
Original line number Diff line number Diff line
@@ -697,6 +697,7 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm, u32 flags) 
	pit->wq = create_singlethread_workqueue("kvm-pit-wq");

	if (!pit->wq) {

		mutex_unlock(&pit->pit_state.lock);

		kvm_free_irq_source_id(kvm, pit->irq_source_id);

		kfree(pit);

		return NULL;

	}
@@ -742,7 +743,7 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm, u32 flags) 
	kvm_unregister_irq_mask_notifier(kvm, 0, &pit->mask_notifier);

	kvm_unregister_irq_ack_notifier(kvm, &pit_state->irq_ack_notifier);

	kvm_free_irq_source_id(kvm, pit->irq_source_id);



	destroy_workqueue(pit->wq);

	kfree(pit);

	return NULL;

}

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -2387,7 +2387,7 @@ static void kvm_vcpu_ioctl_x86_get_xsave(struct kvm_vcpu *vcpu, 
	if (cpu_has_xsave)

		memcpy(guest_xsave->region,

			&vcpu->arch.guest_fpu.state->xsave,

			sizeof(struct xsave_struct));

			xstate_size);

	else {

		memcpy(guest_xsave->region,

			&vcpu->arch.guest_fpu.state->fxsave,
@@ -2405,7 +2405,7 @@ static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu, 


	if (cpu_has_xsave)

		memcpy(&vcpu->arch.guest_fpu.state->xsave,

			guest_xsave->region, sizeof(struct xsave_struct));

			guest_xsave->region, xstate_size);

	else {

		if (xstate_bv & ~XSTATE_FPSSE)

			return -EINVAL;

drivers/char/agp/intel-agp.c

+17 −9
Original line number Diff line number Diff line
@@ -819,13 +819,16 @@ static const struct intel_driver_description { 
	    "Sandybridge", NULL, &intel_gen6_driver },

	{ PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB, PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_IG,

	    "Sandybridge", NULL, &intel_gen6_driver },

	{ PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB, PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_D0_IG,

	    "Sandybridge", NULL, &intel_gen6_driver },

	{ 0, 0, NULL, NULL, NULL }

};



static int __devinit intel_gmch_probe(struct pci_dev *pdev,

				      struct agp_bridge_data *bridge)

{

	int i;

	int i, mask;



	bridge->driver = NULL;



	for (i = 0; intel_agp_chipsets[i].name != NULL; i++) {
@@ -845,14 +848,19 @@ static int __devinit intel_gmch_probe(struct pci_dev *pdev, 


	dev_info(&pdev->dev, "Intel %s Chipset\n", intel_agp_chipsets[i].name);



	if (bridge->driver->mask_memory == intel_i965_mask_memory) {

		if (pci_set_dma_mask(intel_private.pcidev, DMA_BIT_MASK(36)))

	if (bridge->driver->mask_memory == intel_gen6_mask_memory)

		mask = 40;

	else if (bridge->driver->mask_memory == intel_i965_mask_memory)

		mask = 36;

	else

		mask = 32;



	if (pci_set_dma_mask(intel_private.pcidev, DMA_BIT_MASK(mask)))

		dev_err(&intel_private.pcidev->dev,

				"set gfx device dma mask 36bit failed!\n");

			"set gfx device dma mask %d-bit failed!\n", mask);

	else

		pci_set_consistent_dma_mask(intel_private.pcidev,

						    DMA_BIT_MASK(36));

	}

					    DMA_BIT_MASK(mask));



	return 1;

}