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

Commit 22a26e66 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'amd-iommu/fixes' of... 

Merge branch 'amd-iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
parents c7210e1f 1bc6f838

arch/x86/kernel/amd_iommu_init.c

+9 −4
Original line number Diff line number Diff line
@@ -472,6 +472,8 @@ static u8 * __init alloc_event_buffer(struct amd_iommu *iommu) 
	if (iommu->evt_buf == NULL)

		return NULL;



	iommu->evt_buf_size = EVT_BUFFER_SIZE;



	return iommu->evt_buf;

}
@@ -691,6 +693,7 @@ static void __init init_iommu_from_acpi(struct amd_iommu *iommu, 


			devid = e->devid;

			devid_to = e->ext >> 8;

			set_dev_entry_from_acpi(iommu, devid   , e->flags, 0);

			set_dev_entry_from_acpi(iommu, devid_to, e->flags, 0);

			amd_iommu_alias_table[devid] = devid_to;

			break;
@@ -749,10 +752,12 @@ static void __init init_iommu_from_acpi(struct amd_iommu *iommu, 


			devid = e->devid;

			for (dev_i = devid_start; dev_i <= devid; ++dev_i) {

				if (alias)

				if (alias) {

					amd_iommu_alias_table[dev_i] = devid_to;

					set_dev_entry_from_acpi(iommu,

						amd_iommu_alias_table[dev_i],

						devid_to, flags, ext_flags);

				}

				set_dev_entry_from_acpi(iommu, dev_i,

							flags, ext_flags);

			}

			break;